edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

div. Änderungen

Browse Source
This commit is contained in:
d.breimaier
2026-07-24 15:49:21 +02:00
parent 2f1f57d9ee
commit 72b620cba4
7 changed files with 200 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SDL/Fakturierung/cAutomailversand.vb
View File

@@ -500,7 +500,7 @@ Public Class cAutomailversand
End Sub
Private Function do_SR(RechnungsNr As Integer, kdNr As Integer, FirmaID As Integer, Sammelrechnungsart As Integer, DatumBis As Date, Rechnungsdatum As Date, lastAktuelle_RgNr As Integer, DruckDatumZeit As Date, Kopie As Boolean, listPDFs As List(Of String), Optional EinzelAnlagen As Boolean = False, Optional Sammelbericht As Boolean = True, Optional saveInThereFore As Boolean = False, Optional showError As Boolean = True, Optional AbfertigungsArt As String = "", Optional faktGruppe As String = "")
Private Function do_SR(RechnungsNr As Integer, kdNr As Integer, FirmaID As Integer, Sammelrechnungsart As Integer, DatumBis As Date, Rechnungsdatum As Date, lastAktuelle_RgNr As Integer, DruckDatumZeit As Date, Kopie As Boolean, listPDFs As List(Of String), Optional EinzelAnlagen As Boolean = False, Optional Sammelbericht As Boolean = True, Optional saveInThereFore As Boolean = True, Optional showError As Boolean = True, Optional AbfertigungsArt As String = "", Optional faktGruppe As String = "")
Dim RechnungsNrisSet As Boolean = False
@@ -1325,6 +1325,7 @@ Public Class cAutomailversand
If RECHNUNG IsNot Nothing Then
RECHNUNG.Automailversand_sent = Nothing
RECHNUNG.Status = 2
RECHNUNG.DruckDatumZeit = Nothing
RECHNUNG.SAVE()
Else
'Bei FEHLER SAMMELRECHNUNG VON STATUS 4 auf 2 zurücksetzen!

3
SDL/Fakturierung/frmAbrechnungsMaske.vb
View File

@@ -1044,6 +1044,9 @@ Public Class frmAbrechnungsMaske
End If
If cbxMailoeffnen.Checked Then
ShowInfo = ""
End If
If ShowInfo <> "" Then
MsgBox(ShowInfo)

4
SDL/Fakturierung/frmFaktSammelRgDrucken.vb
View File

@@ -1021,6 +1021,10 @@ Public Class frmFaktSammelRgDrucken
Dim ShowInfo As String = ""
fun.sendMailSammelrechnung(CDate(txtRechnungsdatum.Text), Sammelrechung, Firma, getAvisoIds(), getKundenNr(), cbxMailoeffnen.Checked,, CDate(txtZeitraumBis.Text), cbxMailoeffnen.Checked, ShowInfo)
If cbxMailoeffnen.Checked Then
ShowInfo = ""
End If
If ShowInfo <> "" Then
MsgBox(ShowInfo)
End If

139
SDL/USTV/frmMDM_USTVAntrag.Designer.vb generated
View File

@@ -24,8 +24,8 @@ Partial Class frmMDM_USTVAntrag
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDM_USTVAntrag))
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 DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnlBottom = New System.Windows.Forms.Panel()
Me.pbXMLExport = New System.Windows.Forms.PictureBox()
Me.btnRMCQuartal = New System.Windows.Forms.Button()
@@ -56,6 +56,8 @@ 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.txtVZOffen = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label19 = New System.Windows.Forms.Label()
Me.btnSortNachLeist = New System.Windows.Forms.Button()
Me.cbxInterneNr = New System.Windows.Forms.CheckBox()
Me.cbxSicherheit = New System.Windows.Forms.CheckBox()
@@ -120,6 +122,7 @@ Partial Class frmMDM_USTVAntrag
Me.dgvUSTVPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
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.cbxKIUploaddelete = New System.Windows.Forms.CheckBox()
Me.scanUSTVA = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
@@ -130,6 +133,7 @@ Partial Class frmMDM_USTVAntrag
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()
@@ -146,8 +150,6 @@ Partial Class frmMDM_USTVAntrag
Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
Me.FakturiertToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
Me.pnlBottom.SuspendLayout()
CType(Me.pbXMLExport, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -449,7 +451,7 @@ Partial Class frmMDM_USTVAntrag
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(1444, 201)
Me.pnlHeader.Size = New System.Drawing.Size(1444, 224)
Me.pnlHeader.TabIndex = 0
'
'cbxRGretour
@@ -556,7 +558,7 @@ Partial Class frmMDM_USTVAntrag
Me.lblKdNr.Cursor = System.Windows.Forms.Cursors.Default
Me.lblKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblKdNr.ForeColor = System.Drawing.Color.White
Me.lblKdNr.Location = New System.Drawing.Point(79, 65)
Me.lblKdNr.Location = New System.Drawing.Point(79, 62)
Me.lblKdNr.Name = "lblKdNr"
Me.lblKdNr.Size = New System.Drawing.Size(422, 18)
Me.lblKdNr.TabIndex = 21
@@ -569,7 +571,7 @@ Partial Class frmMDM_USTVAntrag
Me.Panel9.Dock = System.Windows.Forms.DockStyle.Left
Me.Panel9.Location = New System.Drawing.Point(0, 0)
Me.Panel9.Name = "Panel9"
Me.Panel9.Size = New System.Drawing.Size(65, 86)
Me.Panel9.Size = New System.Drawing.Size(65, 80)
Me.Panel9.TabIndex = 20
'
'cbxLand
@@ -596,7 +598,7 @@ Partial Class frmMDM_USTVAntrag
Me.lblLand.ForeColor = System.Drawing.Color.Black
Me.lblLand.Location = New System.Drawing.Point(0, 0)
Me.lblLand.Name = "lblLand"
Me.lblLand.Size = New System.Drawing.Size(65, 86)
Me.lblLand.Size = New System.Drawing.Size(65, 80)
Me.lblLand.TabIndex = 11
Me.lblLand.Text = "AT"
Me.lblLand.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -605,6 +607,8 @@ Partial Class frmMDM_USTVAntrag
'
Me.Panel8.BackColor = System.Drawing.Color.WhiteSmoke
Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.Panel8.Controls.Add(Me.txtVZOffen)
Me.Panel8.Controls.Add(Me.Label19)
Me.Panel8.Controls.Add(Me.btnSortNachLeist)
Me.Panel8.Controls.Add(Me.cbxInterneNr)
Me.Panel8.Controls.Add(Me.cbxSicherheit)
@@ -639,18 +643,57 @@ Partial Class frmMDM_USTVAntrag
Me.Panel8.Controls.Add(Me.txtVon)
Me.Panel8.Controls.Add(Me.txtBis)
Me.Panel8.Dock = System.Windows.Forms.DockStyle.Bottom
Me.Panel8.Location = New System.Drawing.Point(0, 86)
Me.Panel8.Location = New System.Drawing.Point(0, 80)
Me.Panel8.Name = "Panel8"
Me.Panel8.Size = New System.Drawing.Size(963, 115)
Me.Panel8.Size = New System.Drawing.Size(963, 144)
Me.Panel8.TabIndex = 19
'
'txtVZOffen
'
Me.txtVZOffen._DateTimeOnly = False
Me.txtVZOffen._numbersOnly = True
Me.txtVZOffen._numbersOnlyKommastellen = "2"
Me.txtVZOffen._numbersOnlyTrennzeichen = True
Me.txtVZOffen._Prozent = False
Me.txtVZOffen._ShortDateNew = False
Me.txtVZOffen._ShortDateOnly = False
Me.txtVZOffen._TimeOnly = False
Me.txtVZOffen._TimeOnly_Seconds = False
Me.txtVZOffen._value = ""
Me.txtVZOffen._Waehrung = True
Me.txtVZOffen._WaehrungZeichen = True
Me.txtVZOffen.Enabled = False
Me.txtVZOffen.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
Me.txtVZOffen.ForeColor = System.Drawing.Color.Black
Me.txtVZOffen.Location = New System.Drawing.Point(654, 116)
Me.txtVZOffen.MaxLength = 10
Me.txtVZOffen.MaxLineLength = -1
Me.txtVZOffen.MaxLines_Warning = ""
Me.txtVZOffen.MaxLines_Warning_Label = Nothing
Me.txtVZOffen.Name = "txtVZOffen"
Me.txtVZOffen.Size = New System.Drawing.Size(125, 23)
Me.txtVZOffen.TabIndex = 60
'
'Label19
'
Me.Label19.AutoSize = True
Me.Label19.BackColor = System.Drawing.Color.Transparent
Me.Label19.Cursor = System.Windows.Forms.Cursors.Hand
Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label19.ForeColor = System.Drawing.Color.Black
Me.Label19.Location = New System.Drawing.Point(524, 117)
Me.Label19.Name = "Label19"
Me.Label19.Size = New System.Drawing.Size(66, 17)
Me.Label19.TabIndex = 59
Me.Label19.Text = "VZ offen:"
'
'btnSortNachLeist
'
Me.btnSortNachLeist.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnSortNachLeist.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btnSortNachLeist.ForeColor = System.Drawing.Color.Black
Me.btnSortNachLeist.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnSortNachLeist.Location = New System.Drawing.Point(210, 86)
Me.btnSortNachLeist.Location = New System.Drawing.Point(8, 114)
Me.btnSortNachLeist.Name = "btnSortNachLeist"
Me.btnSortNachLeist.Size = New System.Drawing.Size(117, 25)
Me.btnSortNachLeist.TabIndex = 58
@@ -1235,7 +1278,7 @@ Partial Class frmMDM_USTVAntrag
Me.lblGesamtUSteuerFW.Name = "lblGesamtUSteuerFW"
Me.lblGesamtUSteuerFW.Size = New System.Drawing.Size(117, 14)
Me.lblGesamtUSteuerFW.TabIndex = 17
Me.lblGesamtUSteuerFW.Text = "000.000,00 €"
Me.lblGesamtUSteuerFW.Text = "000.000,00"
Me.lblGesamtUSteuerFW.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'Label12
@@ -1263,7 +1306,7 @@ Partial Class frmMDM_USTVAntrag
Me.lblDiffernezbetragFW.Name = "lblDiffernezbetragFW"
Me.lblDiffernezbetragFW.Size = New System.Drawing.Size(117, 15)
Me.lblDiffernezbetragFW.TabIndex = 15
Me.lblDiffernezbetragFW.Text = "000.000,00 €"
Me.lblDiffernezbetragFW.Text = "000.000,00"
Me.lblDiffernezbetragFW.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'Label10
@@ -1291,7 +1334,7 @@ Partial Class frmMDM_USTVAntrag
Me.lblGesamtErstattungFW.Name = "lblGesamtErstattungFW"
Me.lblGesamtErstattungFW.Size = New System.Drawing.Size(114, 15)
Me.lblGesamtErstattungFW.TabIndex = 13
Me.lblGesamtErstattungFW.Text = "000.000,00 €"
Me.lblGesamtErstattungFW.Text = "000.000,00"
Me.lblGesamtErstattungFW.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'Label7
@@ -1319,7 +1362,7 @@ Partial Class frmMDM_USTVAntrag
Me.Panel5.Location = New System.Drawing.Point(963, 0)
Me.Panel5.Margin = New System.Windows.Forms.Padding(0)
Me.Panel5.Name = "Panel5"
Me.Panel5.Size = New System.Drawing.Size(481, 201)
Me.Panel5.Size = New System.Drawing.Size(481, 224)
Me.Panel5.TabIndex = 9
'
'Panel7
@@ -1327,7 +1370,7 @@ Partial Class frmMDM_USTVAntrag
Me.Panel7.Controls.Add(Me.Label6)
Me.Panel7.Controls.Add(Me.rtbStatusText)
Me.Panel7.Dock = System.Windows.Forms.DockStyle.Bottom
Me.Panel7.Location = New System.Drawing.Point(0, 74)
Me.Panel7.Location = New System.Drawing.Point(0, 97)
Me.Panel7.Name = "Panel7"
Me.Panel7.Size = New System.Drawing.Size(481, 69)
Me.Panel7.TabIndex = 20
@@ -1366,7 +1409,7 @@ Partial Class frmMDM_USTVAntrag
Me.FlowLayoutPanel.Controls.Add(Me.btnStorno)
Me.FlowLayoutPanel.Controls.Add(Me.lblAntragAbgeschlossen)
Me.FlowLayoutPanel.Dock = System.Windows.Forms.DockStyle.Bottom
Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 143)
Me.FlowLayoutPanel.Location = New System.Drawing.Point(0, 166)
Me.FlowLayoutPanel.Margin = New System.Windows.Forms.Padding(0)
Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
Me.FlowLayoutPanel.Size = New System.Drawing.Size(481, 58)
@@ -1557,9 +1600,9 @@ Partial Class frmMDM_USTVAntrag
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, 206)
Me.pnlBody.Location = New System.Drawing.Point(0, 230)
Me.pnlBody.Name = "pnlBody"
Me.pnlBody.Size = New System.Drawing.Size(1444, 461)
Me.pnlBody.Size = New System.Drawing.Size(1444, 437)
Me.pnlBody.TabIndex = 1
'
'TabControl1
@@ -1570,7 +1613,7 @@ Partial Class frmMDM_USTVAntrag
Me.TabControl1.Location = New System.Drawing.Point(0, 0)
Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 0
Me.TabControl1.Size = New System.Drawing.Size(1442, 459)
Me.TabControl1.Size = New System.Drawing.Size(1442, 435)
Me.TabControl1.TabIndex = 1
'
'TabPage1
@@ -1580,7 +1623,7 @@ Partial Class frmMDM_USTVAntrag
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(1434, 433)
Me.TabPage1.Size = New System.Drawing.Size(1434, 409)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Antragspositionen"
Me.TabPage1.UseVisualStyleBackColor = True
@@ -1590,8 +1633,8 @@ Partial Class frmMDM_USTVAntrag
Me.dgvUSTVPositionen.AKTUALISIERUNGS_INTERVALL = 500
Me.dgvUSTVPositionen.AllowUserToAddRows = False
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
DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvUSTVPositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
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)
@@ -1603,14 +1646,14 @@ Partial Class frmMDM_USTVAntrag
Me.dgvUSTVPositionen.RowHeadersVisible = False
Me.dgvUSTVPositionen.RowHeadersWidth = 62
Me.dgvUSTVPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1428, 158)
Me.dgvUSTVPositionen.Size = New System.Drawing.Size(1428, 134)
Me.dgvUSTVPositionen.TabIndex = 0
'
'pnlAntragsPosDetails
'
Me.pnlAntragsPosDetails.Controls.Add(Me.Panel2)
Me.pnlAntragsPosDetails.Dock = System.Windows.Forms.DockStyle.Bottom
Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 167)
Me.pnlAntragsPosDetails.Location = New System.Drawing.Point(3, 143)
Me.pnlAntragsPosDetails.Name = "pnlAntragsPosDetails"
Me.pnlAntragsPosDetails.Size = New System.Drawing.Size(1428, 263)
Me.pnlAntragsPosDetails.TabIndex = 2
@@ -1627,6 +1670,14 @@ Partial Class frmMDM_USTVAntrag
Me.Panel2.Size = New System.Drawing.Size(1428, 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(1272, 261)
Me.UstCntlUSTV_AntragPosition1.TabIndex = 0
'
'Panel4
'
Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1722,7 +1773,7 @@ Partial Class frmMDM_USTVAntrag
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(1434, 433)
Me.TabPage2.Size = New System.Drawing.Size(1434, 409)
Me.TabPage2.TabIndex = 1
Me.TabPage2.Text = "Erstattungspositionen"
Me.TabPage2.UseVisualStyleBackColor = True
@@ -1736,7 +1787,7 @@ Partial Class frmMDM_USTVAntrag
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(1428, 427)
Me.Panel3.Size = New System.Drawing.Size(1428, 403)
Me.Panel3.TabIndex = 3
'
'dgvErstattungspositionen
@@ -1744,8 +1795,8 @@ Partial Class frmMDM_USTVAntrag
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
DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
Me.dgvErstattungspositionen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
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)
@@ -1757,7 +1808,7 @@ Partial Class frmMDM_USTVAntrag
Me.dgvErstattungspositionen.RowHeadersVisible = False
Me.dgvErstattungspositionen.RowHeadersWidth = 62
Me.dgvErstattungspositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1428, 161)
Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1428, 137)
Me.dgvErstattungspositionen.TabIndex = 1
'
'pnlErstattungsdetails
@@ -1767,11 +1818,19 @@ Partial Class frmMDM_USTVAntrag
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, 164)
Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 140)
Me.pnlErstattungsdetails.Name = "pnlErstattungsdetails"
Me.pnlErstattungsdetails.Size = New System.Drawing.Size(1426, 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(1270, 259)
Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
'
'Panel1
'
Me.Panel1.BackColor = System.Drawing.Color.WhiteSmoke
@@ -1890,22 +1949,6 @@ Partial Class frmMDM_USTVAntrag
Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen"
Me.FakturiertToolStripMenuItem.Visible = False
'
'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(1272, 261)
Me.UstCntlUSTV_AntragPosition1.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(1270, 259)
Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
'
'frmMDM_USTVAntrag
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2078,4 +2121,6 @@ Partial Class frmMDM_USTVAntrag
Friend WithEvents pbXMLExport As PictureBox
Friend WithEvents cbxInterneNr As CheckBox
Friend WithEvents btnSortNachLeist As Button
Friend WithEvents txtVZOffen As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label19 As Label
End Class

26
SDL/USTV/frmMDM_USTVAntrag.vb
View File

@@ -223,10 +223,19 @@ Public Class frmMDM_USTVAntrag
Dim GesamtErstattung As Double = SQL.DLookup("isnull(sum(UStVEr_USteuerbetrag),0)", "tblUStVErstattung", "UStVAn_ID='" & UStVAn_ID & "'", "FMZOLL", "0")
Dim Differnezbetrag As Double = GesamtUSteuer - GesamtErstattung
Dim FW As String = cbxWahrung._value
lblGesamtUSteuerFW.Text = GesamtUSteuer.ToString("C2")
lblGesamtErstattungFW.Text = GesamtErstattung.ToString("C2")
lblDiffernezbetragFW.Text = Differnezbetrag.ToString("C2")
If FW <> "EUR" Then
lblGesamtUSteuerFW.Text = lblGesamtUSteuerFW.Text.Replace("€", FW)
lblGesamtErstattungFW.Text = lblGesamtErstattungFW.Text.Replace("€", FW)
lblDiffernezbetragFW.Text = lblDiffernezbetragFW.Text.Replace("€", FW)
End If
lblGesamtUSteuer.Text = GesamtUSteuerEUR.ToString("C2")
lblGesamtErstattung.Text = GesamtErstattungEUR.ToString("C2")
lblDiffernezbetrag.Text = DiffernezbetragEUR.ToString("C2")
@@ -557,7 +566,7 @@ Public Class frmMDM_USTVAntrag
Antrag_LandKz = SQL.DLookup("LandKz", "[Länderverzeichnis für die Außenhandelsstatistik]", "Landnr='" & USTV_ANTRAG.UStVAn_LandNr & "'", "FMZOLL")
setValue(USTV_ANTRAG)
If (CInt(USTV_ANTRAG.UStVAn_KuNr) >= 150000 AndAlso CInt(USTV_ANTRAG.UStVAn_KuNr) < 160000) Or (CInt(USTV_ANTRAG.UStVAn_KuNr) >= 180000 AndAlso CInt(USTV_ANTRAG.UStVAn_KuNr) < 190000) Then
If (CInt(USTV_ANTRAG.UStVAn_KuNr) >= 150000 AndAlso CInt(USTV_ANTRAG.UStVAn_KuNr) <160000) Or (CInt(USTV_ANTRAG.UStVAn_KuNr) >= 180000 AndAlso CInt(USTV_ANTRAG.UStVAn_KuNr) <190000) Then
btnRMCQuartal.Visible = True
Else
btnRMCQuartal.Visible = False
@@ -5255,6 +5264,21 @@ Public Class frmMDM_USTVAntrag
End Function
Private Sub txtRZ_ValueChanged() Handles txtRZ.TextChanged, txtVZ.TextChanged
Dim VZ As Double = 0
Dim RZ As Double = 0
If txtVZ.Text <> "" AndAlso IsNumeric(txtVZ.Text) Then
VZ = CDbl(txtVZ.Text)
If txtRZ.Text <> "" AndAlso IsNumeric(txtRZ.Text) Then
RZ = CDbl(txtRZ.Text)
End If
txtVZOffen.Text = VZ - RZ
End If
End Sub
Public Shared Function rearangePosNrByLeistender(UStVAn_ID As Integer)

113
SDL/USTV/usrCntlUSTV.vb
View File

@@ -4,6 +4,7 @@ Imports System.Text
Imports GrapeCity.DataVisualization.TypeScript
Imports Microsoft.Office.Interop
Imports VERAG_PROG_ALLGEMEIN
Imports VERAG_PROG_ALLGEMEIN.TESTJSON
Public Class usrCntlUSTV
@@ -47,7 +48,7 @@ Public Class usrCntlUSTV
End If
End If
Dim sql_query As String = "SELECT " & topMax & " [tblUStVAntrag].[UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz as Land_Antrag , UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm,[UStVAn_VZBetrag],[UStVAn_VZDatum],[UStVAn_3470],STUFF((
Dim sql_query As String = "SELECT " & topMax & " [tblUStVAntrag].[UStVAn_ID],UStVAn_AntragArt,[UStVAn_KuNr],[UStVAn_Name],[UStVAn_LandKz],LandKz as Land_Antrag , UStVAn_BezugsNr, [UStVAn_ReDatVon], [UStVAn_ReDatBis] ,UStVAn_AntragEingereichtAm, isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0) as UStVAn_VZBetrag,[UStVAn_VZDatum],[UStVAn_3470],STUFF((
SELECT ', ' + CAST(e.GutschriftsNr AS VARCHAR(50))
From tblUStVErstattung e
Where e.UStVAn_ID = [tblUStVAntrag].[UStVAn_ID]
@@ -397,7 +398,7 @@ Public Class usrCntlUSTV
' AND cast( [UStVAn_USteuerbetragEUR] as decimal(17,2))-cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))<>0
' AND UStVAn_AntragEingereichtAm is not null
' order by UStVAn_KuNr,UStVAn_Name,datepart(year,[UStVAn_ReDatVon] ) desc,LandKz,[UStVAn_ReDatVon] desc"
Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, UStVAn_VZBetrag as VZ, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr
Dim sqlStr = "SELECT [UStVAn_ID] as ID,[UStVAn_KuNr] as KDNR,[UStVAn_Name] as Kundename,Adressen.LandKz as LKZ_KD, case when UstIdKz is not null and UstIdNr is not null THEN UstIdKz +'' + UstIdNr ELSE isnull(Steuernummer,'') END as SteuerUIDNr, LfdA.LandKz as LKZ,cast([UStVAn_ReDatVon] as Date) as ReDatVon,cast([UStVAn_ReDatBis] as Date) as ReDatBis , cast(UStVAn_AntragEingereichtAm as Date) as EingereichtAm,[UStVAn_3470] as An3470 ,[UStVAn_Währungscode] as WKZ,[UStVAn_USteuerbetrag] as Steuerbetrag,[UStVAn_Erstattungsbetrag] as Erstattungsbetrag,[UStVAn_USteuerbetragEUR] as SteuerbetragEUR,[UStVAn_ErstattungsbetragEUR] as ErstattungsbetragEUR,(cast([UStVAn_USteuerbetragEUR] as decimal(17,2)) - cast( [UStVAn_ErstattungsbetragEUR] as decimal(17,2))) as DifferenzbetragEUR, (isnull(UStVAn_VZBetrag,0) - isnull(UStVAn_RZBetragVZ,0)) as VZ, [UStVAn_Sachbearbeiter] as Sachbearbeiter, UStVAn_AntragArt as Art, stnr.[StNrFürRückerstattungUSt] as SteuerNr
FROM [tblUStVAntrag]
inner join [Länderverzeichnis für die Außenhandelsstatistik] as LfdA on UStVAn_LandNr=Landnr
inner join Adressen on AdressenNr=UStVAn_KuNr
@@ -1754,6 +1755,8 @@ Public Class usrCntlUSTV
Try
Dim importiert As Boolean = False
Dim fd As New OpenFileDialog
fd.InitialDirectory = "\\share01.verag.ost.dmn\F\19 VERAG 360 - MDM\MWST Eingänge\"
fd.Filter = "Excel Dateien (*.xlsx)|*.xlsx"
@@ -1838,8 +1841,8 @@ Public Class usrCntlUSTV
Dim Zahlungsbetrag As String =
Convert.ToString(Blatt.Cells(row, headerMap("Steuerbetrag")).Value)
Dim Kuerzel As String =
getTrimedString(Convert.ToString(Blatt.Cells(row, headerMap("Spalte1")).Value), 6)
Dim BelNr As String =
getTrimedString(Convert.ToString(Blatt.Cells(row, headerMap("BelNr")).Value), 6)
Dim Bank As String =
Convert.ToString(Blatt.Cells(row, headerMap("BANK")).Value)
@@ -1867,12 +1870,17 @@ Public Class usrCntlUSTV
R("AntragID") = USTAV_ID
R("Steuerbetrag") = Zahlungsbetrag
R("Bank") = Bank
R("BelegNr") = Kuerzel
R("BelegNr") = BelNr
R("GS") = GS
R("RZVZ") = RZVZ
R("Info") = INFO
dt.Rows.Add(R)
Else
Continue For
End If
@@ -1880,67 +1888,65 @@ Public Class usrCntlUSTV
If dt.Rows.Count > 0 Then
Dim frm As New Form
Dim dgv As New DataGridView()
Using frm As New frmAbrechnungHandling(dt, Nothing, "Import " & dt.Rows.Count & " Erstattungspositionen")
dgv.DataSource = dt
If dgv IsNot Nothing Then
frm.Size = New Size(1400, 1000)
dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50)
dgv.Dock = DockStyle.Fill
dgv.Anchor = AnchorStyles.Left
dgv.Anchor = AnchorStyles.Top
dgv.ReadOnly = True
frm.Controls.Add(dgv)
frm.StartPosition = FormStartPosition.CenterScreen
frm.ShowDialog()
End If
frm.btnPreisliste.Visible = False
frm.Button2.Text = "Importieren"
If vbYes = MsgBox("Es wurden " & dt.Rows.Count & " Datensätze erkannt. " & vbNewLine & "Sollen diese eingearbeitet werden?", vbYesNoCancel) Then
If frm.ShowDialog() = DialogResult.OK Then
For Each r As DataRow In dt.Rows
Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(r.Item("AntragID"))
For Each r As DataRow In dt.Rows
If USTV_ANTRAG.hasEntry Then
Dim USTV_ANTRAG = New VERAG_PROG_ALLGEMEIN.cUSTVAntrag(r.Item("AntragID"))
Select Case r.Item("3470").ToString.ToLower
Case "ja"
If Not USTV_ANTRAG.UStVAn_3470 Then
USTV_ANTRAG.UStVAn_3470 = True
USTV_ANTRAG.SAVE()
End If
If USTV_ANTRAG.hasEntry Then
'Case "nein"
' If USTV_ANTRAG.UStVAn_3470 Then
' USTV_ANTRAG.UStVAn_3470 = False
' USTV_ANTRAG.SAVE()
' End If
Select Case r.Item("3470").ToString.ToLower
Case "ja"
If Not USTV_ANTRAG.UStVAn_3470 Then
USTV_ANTRAG.UStVAn_3470 = True
USTV_ANTRAG.SAVE()
End If
End Select
'Case "nein"
' If USTV_ANTRAG.UStVAn_3470 Then
' USTV_ANTRAG.UStVAn_3470 = False
' USTV_ANTRAG.SAVE()
' End If
End Select
Dim UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen()
UStV_ERS.UStVEr_ID = USTV_ANTRAG.getMaxPosNrErst()
UStV_ERS.UStVEr_interneNr = USTV_ANTRAG.getMaxinternePosNrErst()
UStV_ERS.UStVAn_ID = USTV_ANTRAG.UStVAn_ID
Dim UStV_ERS = New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen()
UStV_ERS.UStVEr_ID = USTV_ANTRAG.getMaxPosNrErst()
UStV_ERS.UStVEr_interneNr = USTV_ANTRAG.getMaxinternePosNrErst()
UStV_ERS.UStVAn_ID = USTV_ANTRAG.UStVAn_ID
End If
End If
Next
Next
Else
importiert = True
End If
End Using
Else
Exit Sub
End If
End If
Finally
@@ -1972,6 +1978,25 @@ Public Class usrCntlUSTV
GC.Collect()
GC.WaitForPendingFinalizers()
If importiert Then
Dim zielOrdner As String = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(fd.FileName), "importiert")
If Not System.IO.Directory.Exists(zielOrdner) Then
System.IO.Directory.CreateDirectory(zielOrdner)
End If
Dim zielDatei As String = System.IO.Path.Combine(zielOrdner, System.IO.Path.GetFileName(fd.FileName))
'Falls bereits vorhanden, überschreiben
If System.IO.File.Exists(zielDatei) Then
System.IO.File.Delete(zielDatei)
End If
System.IO.File.Move(fd.FileName, zielDatei)
End If
End Try
Catch ex As Exception

5
VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb
View File

@@ -1284,6 +1284,11 @@ BindingFlags.Instance Or BindingFlags.NonPublic, Nothing, [Control], New Object(
invalid.Add(e)
Continue For
End If
' Keine führenden/abschließenden Semikolons
If localPart.EndsWith("; ") Then
invalid.Add(e)
Continue For
End If
' Keine doppelten Punkte
If localPart.Contains("..") Then