fiskal, Abrechungsmaske, etx.

SDL/Classes/cFiskaltrustClient_chilkat.vb

@@ -489,7 +489,6 @@ Public Class cFiskaltrustClient_chilkat
         json.UpdateString("cbReceiptMoment", DateTime.UtcNow.ToString("o"))
         json.UpdateString("ftReceiptCase", (FtReceiptCases.OutOfOperation).ToString())
         json.UpdateString("cbReceiptReference", "OutOfOperation")
-
         json.UpdateString("cbUser", "Admin")
         json.UpdateString("ftReceiptCaseData", "")
 
@@ -644,47 +643,48 @@ Public Class cFiskaltrustClient_chilkat
 
             Dim numSignatures As Integer = Signatures.Size
 
-            For i = 0 To numSignatures - 1
+        For i = 0 To numSignatures - 1
 
 
-                Dim SignObj As Chilkat.JsonObject = Signatures.ObjectAt(i)
-                Dim ftSigPos As New cFiskaltrustSignaturPositions()
+            Dim SignObj As Chilkat.JsonObject = Signatures.ObjectAt(i)
+            Dim ftSigPos As New cFiskaltrustSignaturPositions()
 
-                With ftSigPos
-                    .ftSignatures = ftSig.ft_id
-                    .ftData = SignObj.StringOf("Data")
-                    .ftSignatureFormat = SignObj.StringOf("ftSignatureFormat")
-                    .ftSignatureType = SignObj.StringOf("ftSignatureType")
-                    saved = .SAVE()
-                    'If IsNumeric(.ftSignatureType) AndAlso CInt(.ftSignatureType) = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True, 0, 3) Then
-                    '    QR_CodeString = .ftData
-                    'End If
-
-                    'https://receipts.fiskaltrust.eu/{ftQueueID}/{ftQueueItemID}
-                    Dim URL_FT As String = ""
-                    If Not String.IsNullOrWhiteSpace(ftSig.ftQueueID) AndAlso Not String.IsNullOrWhiteSpace(ftSig.ftQueueItemID) Then
-                        URL_FT = $"https://receipts.fiskaltrust.eu/{ftSig.ftQueueID}/{ftSig.ftQueueItemID}"
-
-                        Using qrGenerator As New QRCodeGenerator()
-                            Using qrData As QRCodeData = qrGenerator.CreateQrCode(URL_FT, QRCodeGenerator.ECCLevel.Q)
-
-                                Dim qrCode As New PngByteQRCode(qrData)
-                                Dim qrBytes As Byte() = qrCode.GetGraphic(20)
-                                Dim qrBase64 As String = Convert.ToBase64String(qrBytes)
-
-                                QR_CodeString = qrBase64
-
-                            End Using
-                        End Using
+            With ftSigPos
+                .ftSignatures = ftSig.ft_id
+                .ftData = SignObj.StringOf("Data")
+                .ftSignatureFormat = SignObj.StringOf("ftSignatureFormat")
+                .ftSignatureType = SignObj.StringOf("ftSignatureType")
+                saved = .SAVE()
+                'If IsNumeric(.ftSignatureType) AndAlso CInt(.ftSignatureType) = IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True, 0, 3) Then
+                '    QR_CodeString = .ftData
+                'End If
 
 
-                    End If
-                End With
+            End With
 
-            Next
+        Next
+
+        'https://receipts.fiskaltrust.eu/{ftQueueID}/{ftQueueItemID}
+        Dim URL_FT As String = ""
+        If Not String.IsNullOrWhiteSpace(ftSig.ftQueueID) AndAlso Not String.IsNullOrWhiteSpace(ftSig.ftQueueItemID) Then
+            URL_FT = $"https://receipts.fiskaltrust.eu/{ftSig.ftQueueID}/{ftSig.ftQueueItemID}"
+
+            Using qrGenerator As New QRCodeGenerator()
+                Using qrData As QRCodeData = qrGenerator.CreateQrCode(URL_FT, QRCodeGenerator.ECCLevel.Q)
+
+                    Dim qrCode As New PngByteQRCode(qrData)
+                    Dim qrBytes As Byte() = qrCode.GetGraphic(20)
+                    Dim qrBase64 As String = Convert.ToBase64String(qrBytes)
+
+                    QR_CodeString = qrBase64
+
+                End Using
+            End Using
+
+        End If
 
 
-            Return saved
+        Return saved
 
 
     End Function

SDL/Fakturierung/frmAbrechnungsMaske.Designer.vb

@@ -60,7 +60,6 @@ Partial Class frmAbrechnungsMaske
         Me.lblRechnungsdatumAUTOMAIL = New System.Windows.Forms.Label()
         Me.lblKunde = New System.Windows.Forms.Label()
         Me.PictureBox5 = New System.Windows.Forms.PictureBox()
-        Me.cbxGutschriftenAnVerag = New System.Windows.Forms.CheckBox()
         Me.cboRechnungsdruck = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.Label14 = New System.Windows.Forms.Label()
         Me.cbx = New System.Windows.Forms.CheckBox()
@@ -92,6 +91,7 @@ Partial Class frmAbrechnungsMaske
         Me.btnMonat = New System.Windows.Forms.Button()
         Me.btnBisJahr = New System.Windows.Forms.Button()
         Me.btnVonJahr = New System.Windows.Forms.Button()
+        Me.cbxGutschriftenAnVerag = New System.Windows.Forms.CheckBox()
         Me.UsrCntlFaktAbrechnung1 = New SDL.usrCntlFaktAbrechnung()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.pnl.SuspendLayout()
@@ -494,7 +494,6 @@ Partial Class frmAbrechnungsMaske
         Me.Panel1.Controls.Add(Me.lblRechnungsdatumAUTOMAIL)
         Me.Panel1.Controls.Add(Me.lblKunde)
         Me.Panel1.Controls.Add(Me.PictureBox5)
-        Me.Panel1.Controls.Add(Me.cbxGutschriftenAnVerag)
         Me.Panel1.Controls.Add(Me.cboRechnungsdruck)
         Me.Panel1.Controls.Add(Me.Label14)
         Me.Panel1.Controls.Add(Me.cbx)
@@ -505,6 +504,7 @@ Partial Class frmAbrechnungsMaske
         Me.Panel1.Controls.Add(Me.lblSachbearbeiter)
         Me.Panel1.Controls.Add(Me.cboFirma)
         Me.Panel1.Controls.Add(Me.MyPanel1)
+        Me.Panel1.Controls.Add(Me.cbxGutschriftenAnVerag)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Margin = New System.Windows.Forms.Padding(2)
@@ -607,16 +607,6 @@ Partial Class frmAbrechnungsMaske
         Me.PictureBox5.TabIndex = 133
         Me.PictureBox5.TabStop = False
         '
-        'cbxGutschriftenAnVerag
-        '
-        Me.cbxGutschriftenAnVerag.AutoSize = True
-        Me.cbxGutschriftenAnVerag.Location = New System.Drawing.Point(334, 66)
-        Me.cbxGutschriftenAnVerag.Name = "cbxGutschriftenAnVerag"
-        Me.cbxGutschriftenAnVerag.Size = New System.Drawing.Size(128, 17)
-        Me.cbxGutschriftenAnVerag.TabIndex = 54
-        Me.cbxGutschriftenAnVerag.Text = "nicht an Verag abger."
-        Me.cbxGutschriftenAnVerag.UseVisualStyleBackColor = True
-        '
         'cboRechnungsdruck
         '
         Me.cboRechnungsdruck._allowedValuesFreiText = Nothing
@@ -644,11 +634,11 @@ Partial Class frmAbrechnungsMaske
         Me.cbx.AutoSize = True
         Me.cbx.Checked = True
         Me.cbx.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbx.Location = New System.Drawing.Point(334, 83)
+        Me.cbx.Location = New System.Drawing.Point(313, 65)
         Me.cbx.Name = "cbx"
-        Me.cbx.Size = New System.Drawing.Size(181, 17)
+        Me.cbx.Size = New System.Drawing.Size(139, 17)
         Me.cbx.TabIndex = 34
-        Me.cbx.Text = "Gedruckte Rechnugen anzeigen"
+        Me.cbx.Text = "gedruckte Rechnungen"
         Me.cbx.UseVisualStyleBackColor = True
         '
         'cboER_SR
@@ -738,9 +728,9 @@ Partial Class frmAbrechnungsMaske
         Me.MyPanel1.Controls.Add(Me.btnBisJahr)
         Me.MyPanel1.Controls.Add(Me.btnVonJahr)
         Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.MyPanel1.Location = New System.Drawing.Point(0, 102)
+        Me.MyPanel1.Location = New System.Drawing.Point(0, 100)
         Me.MyPanel1.Name = "MyPanel1"
-        Me.MyPanel1.Size = New System.Drawing.Size(575, 85)
+        Me.MyPanel1.Size = New System.Drawing.Size(575, 87)
         Me.MyPanel1.TabIndex = 51
         Me.MyPanel1.Visible = False
         '
@@ -1055,6 +1045,16 @@ Partial Class frmAbrechnungsMaske
         Me.btnVonJahr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnVonJahr.UseVisualStyleBackColor = True
         '
+        'cbxGutschriftenAnVerag
+        '
+        Me.cbxGutschriftenAnVerag.AutoSize = True
+        Me.cbxGutschriftenAnVerag.Location = New System.Drawing.Point(454, 65)
+        Me.cbxGutschriftenAnVerag.Name = "cbxGutschriftenAnVerag"
+        Me.cbxGutschriftenAnVerag.Size = New System.Drawing.Size(118, 17)
+        Me.cbxGutschriftenAnVerag.TabIndex = 54
+        Me.cbxGutschriftenAnVerag.Text = "offene VERAG-Abr."
+        Me.cbxGutschriftenAnVerag.UseVisualStyleBackColor = True
+        '
         'UsrCntlFaktAbrechnung1
         '
         Me.UsrCntlFaktAbrechnung1.BackColor = System.Drawing.Color.White

SDL/Fakturierung/frmFaktEmail.vb

@@ -1,5 +1,4 @@
-Imports GrapeCity.DataVisualization.TypeScript
-Imports Microsoft.Office.Interop
+Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmFaktEmail
@@ -798,25 +797,24 @@ Public Class frmFaktEmail
                         If SPEDBUCH.hasEntry AndAlso (SPEDBUCH.Abfertigungsart = 114 Or SPEDBUCH.Abfertigungsart = 115) Then
 
                             Dim USTV_ANTRAG As New cUSTVAntrag(RECHNUNG.ErfassungsNr)
-                            Dim bearbGeb As Double = 0
-                            Dim hasVZ As Boolean = False
+                            Dim GUBetrag_ohneBearbeitung As Double = 0
+                            Dim hatNichtAbgerechneteVZ As Boolean = False
 
                             'todo_Prüfung ist zu spät -> früher (vor dem eintragen in die DB)!!!!
                             For Each pos In USTV_ANTRAG.POSITIONEN
                                 If pos.UStVPo_VZ AndAlso (IsDBNull(pos.UStVPo_VZ_RKID) OrElse pos.UStVPo_VZ_RKID Is Nothing) Then 'VZ die noch nicht abgerechnet wurde!
-                                    hasVZ = True
+                                    hatNichtAbgerechneteVZ = True
                                     Exit For
                                 End If
                             Next
 
                             For Each r As cRechnungsausgangPositionen In RECHNUNG.POSITIONEN
 
-                                If r.BerechnungsartNr = 8 AndAlso (r.LeistungsBez.ToLower.Contains("mwst") Or r.LeistungsBez.ToLower.Contains("moest") Or r.LeistungsBez.ToLower.Contains("vat") Or r.LeistungsBez.ToLower.Contains("excise duty") Or r.LeistungsBez.ToLower.Contains("tva")) Then bearbGeb += r.Preis
+                                If r.BerechnungsartNr = 8 AndAlso (r.LeistungsBez.ToLower.Contains("mwst") Or r.LeistungsBez.ToLower.Contains("moest") Or r.LeistungsBez.ToLower.Contains("vat") Or r.LeistungsBez.ToLower.Contains("excise duty") Or r.LeistungsBez.ToLower.Contains("tva")) Then GUBetrag_ohneBearbeitung += r.Preis
 
                             Next
 
-                            'nur bei NICHT VZ!
-                            If Not hasVZ Then
+                            If Not hatNichtAbgerechneteVZ Then
                                 'Dim ANTR_ERSTATTUNG As New VERAG_PROG_ALLGEMEIN.cUStVErstattungPositionen(USTV_ANTRAG.UStVAn_ID, RECHNUNG.UnterNr + 1)
                                 'If Not ANTR_ERSTATTUNG.hasEntry Then
                                 '    ANTR_ERSTATTUNG.GutschriftsDatum = RECHNUNG.RechnungsDatum
@@ -828,30 +826,36 @@ Public Class frmFaktEmail
                                 'End If
 
 
-                                If IsDBNull(USTV_ANTRAG.UStVAn_VZBetrag) AndAlso IsDBNull(USTV_ANTRAG.UStVAn_VZDatum) Then
+                                If IsDBNull(USTV_ANTRAG.UStVAn_VZBetrag) Then
 
-                                    USTV_ANTRAG.UStVAn_VZBetrag = bearbGeb
+                                    USTV_ANTRAG.UStVAn_VZBetrag = GUBetrag_ohneBearbeitung
+                                    USTV_ANTRAG.UStVAn_VZDatum = RECHNUNG.RechnungsDatum
+                                    USTV_ANTRAG.SAVE()
+
+                                Else
+
+                                    USTV_ANTRAG.UStVAn_VZBetrag += GUBetrag_ohneBearbeitung
                                     USTV_ANTRAG.UStVAn_VZDatum = RECHNUNG.RechnungsDatum
                                     USTV_ANTRAG.SAVE()
 
                                 End If
                             End If
 
-                            If hasVZ Then
-                                    Dim SQL As New SQL
+                            If hatNichtAbgerechneteVZ Then
+                                Dim SQL As New SQL
 
-                                    For Each pos As cUStVPositionen In USTV_ANTRAG.POSITIONEN
+                                For Each pos As cUStVPositionen In USTV_ANTRAG.POSITIONEN
 
-                                        If Not IsDBNull(pos.UStVPo_VZ) AndAlso pos.UStVPo_VZ AndAlso (IsDBNull(pos.UStVPo_VZ_RKID) Or pos.UStVPo_VZ_RKID Is Nothing) Then
-                                            pos.UStVPo_VZ_RKID = RECHNUNG.RK_ID
-                                            pos.SAVE()
-                                        End If
+                                    If Not IsDBNull(pos.UStVPo_VZ) AndAlso pos.UStVPo_VZ AndAlso (IsDBNull(pos.UStVPo_VZ_RKID) Or pos.UStVPo_VZ_RKID Is Nothing) Then
+                                        pos.UStVPo_VZ_RKID = RECHNUNG.RK_ID
+                                        pos.SAVE()
+                                    End If
 
-                                    Next
+                                Next
 
-                                    Dim count_nichtAbgerVZ As Integer = -1
-                                    count_nichtAbgerVZ = CInt(SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblUStVPositionen] WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & "  and  [UStVPo_VZ] = 1 and isnull(UStVPo_VZ_RKID,0) = 0", "FMZOLL"))
-                                    If count_nichtAbgerVZ = 0 Then
+                                Dim count_nichtAbgerVZ As Integer = -1
+                                count_nichtAbgerVZ = CInt(SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblUStVPositionen] WHERE [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & "  and  [UStVPo_VZ] = 1 and isnull(UStVPo_VZ_RKID,0) = 0", "FMZOLL"))
+                                If count_nichtAbgerVZ = 0 Then
                                     SQL.doSQL("UPDATE [tblUStVAntrag] SET UStVAn_VZoffen = 0 WHERE [UStVAn_ID] IN (SELECT [UStVAn_ID] FROM [tblUStVPositionen] WHERE isnull([UStVPo_VZ],0) = 1 AND [UStVAn_ID] = " & USTV_ANTRAG.UStVAn_ID & " )", "FMZOLL")
                                 End If
 
@@ -859,7 +863,7 @@ Public Class frmFaktEmail
                             End If
 
 
-                            End If
+                        End If
 
 
                         End If
@@ -1194,7 +1198,7 @@ Public Class frmFaktEmail
                 If cbxMDMAnh.Checked Then
                     Mail.Attachments.Add(a.Pfad, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , a.MailName)
                 Else
-                    If a.Pfad.ToString.toLowerCase.EndsWith("maut_at.pdf") Or a.Pfad.ToString.toLowerCase.EndsWith("maut_uta.pdf") Or a.Pfad.ToString.toLowerCase.EndsWith("maut_mse.pdf") Then
+                    If a.Pfad.ToString.ToLower.EndsWith("maut_at.pdf") Or a.Pfad.ToString.ToLower.EndsWith("maut_uta.pdf") Or a.Pfad.ToString.ToLower.EndsWith("maut_mse.pdf") Then
                         'NICHT ANFÜGEN!
                     Else
                         Mail.Attachments.Add(a.Pfad, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue, , a.MailName)

SDL/USTV/frmMDM_USTVAntrag.Designer.vb

@@ -124,6 +124,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()
@@ -134,6 +135,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()
@@ -150,8 +152,8 @@ 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.txtErstattung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label21 = New System.Windows.Forms.Label()
         Me.pnlBottom.SuspendLayout()
         CType(Me.pbXMLExport, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.pbMail, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -631,6 +633,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.Label21)
+        Me.Panel8.Controls.Add(Me.txtErstattung)
         Me.Panel8.Controls.Add(Me.txtVZOffen)
         Me.Panel8.Controls.Add(Me.Label19)
         Me.Panel8.Controls.Add(Me.btnSortNachLeist)
@@ -689,13 +693,13 @@ Partial Class frmMDM_USTVAntrag
         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.Location = New System.Drawing.Point(884, 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.Size = New System.Drawing.Size(78, 23)
         Me.txtVZOffen.TabIndex = 60
         '
         'Label19
@@ -705,7 +709,7 @@ Partial Class frmMDM_USTVAntrag
         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.Location = New System.Drawing.Point(800, 122)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(66, 17)
         Me.Label19.TabIndex = 59
@@ -1694,6 +1698,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
@@ -1789,7 +1801,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, 409)
+        Me.TabPage2.Size = New System.Drawing.Size(1434, 405)
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Erstattungspositionen"
         Me.TabPage2.UseVisualStyleBackColor = True
@@ -1803,7 +1815,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, 403)
+        Me.Panel3.Size = New System.Drawing.Size(1428, 399)
         Me.Panel3.TabIndex = 3
         '
         'dgvErstattungspositionen
@@ -1824,7 +1836,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, 137)
+        Me.dgvErstattungspositionen.Size = New System.Drawing.Size(1428, 133)
         Me.dgvErstattungspositionen.TabIndex = 1
         '
         'pnlErstattungsdetails
@@ -1834,11 +1846,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, 140)
+        Me.pnlErstattungsdetails.Location = New System.Drawing.Point(0, 136)
         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
@@ -1957,21 +1977,44 @@ Partial Class frmMDM_USTVAntrag
         Me.FakturiertToolStripMenuItem.Text = "Fakturiert zurücksetzen"
         Me.FakturiertToolStripMenuItem.Visible = False
         '
-        'UstCntlUSTV_AntragPosition1
+        'txtErstattung
         '
-        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
+        Me.txtErstattung._DateTimeOnly = False
+        Me.txtErstattung._numbersOnly = True
+        Me.txtErstattung._numbersOnlyKommastellen = "2"
+        Me.txtErstattung._numbersOnlyTrennzeichen = True
+        Me.txtErstattung._Prozent = False
+        Me.txtErstattung._ShortDateNew = False
+        Me.txtErstattung._ShortDateOnly = False
+        Me.txtErstattung._TimeOnly = False
+        Me.txtErstattung._TimeOnly_Seconds = False
+        Me.txtErstattung._value = ""
+        Me.txtErstattung._Waehrung = True
+        Me.txtErstattung._WaehrungZeichen = True
+        Me.txtErstattung.Enabled = False
+        Me.txtErstattung.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+        Me.txtErstattung.ForeColor = System.Drawing.Color.Black
+        Me.txtErstattung.Location = New System.Drawing.Point(654, 114)
+        Me.txtErstattung.MaxLength = 10
+        Me.txtErstattung.MaxLineLength = -1
+        Me.txtErstattung.MaxLines_Warning = ""
+        Me.txtErstattung.MaxLines_Warning_Label = Nothing
+        Me.txtErstattung.Name = "txtErstattung"
+        Me.txtErstattung.Size = New System.Drawing.Size(125, 23)
+        Me.txtErstattung.TabIndex = 61
         '
-        'UstCntlUSTV_AntragErstattungen1
+        'Label21
         '
-        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
+        Me.Label21.AutoSize = True
+        Me.Label21.BackColor = System.Drawing.Color.Transparent
+        Me.Label21.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label21.ForeColor = System.Drawing.Color.Black
+        Me.Label21.Location = New System.Drawing.Point(524, 119)
+        Me.Label21.Name = "Label21"
+        Me.Label21.Size = New System.Drawing.Size(77, 17)
+        Me.Label21.TabIndex = 62
+        Me.Label21.Text = "Erstattung:"
         '
         'frmMDM_USTVAntrag
         '
@@ -2149,4 +2192,6 @@ Partial Class frmMDM_USTVAntrag
     Friend WithEvents Label19 As Label
     Friend WithEvents lblVZAenderungsdatum As Label
     Friend WithEvents Label20 As Label
+    Friend WithEvents Label21 As Label
+    Friend WithEvents txtErstattung As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class

SDL/USTV/frmMDM_USTVAntrag.vb

@@ -396,6 +396,8 @@ Public Class frmMDM_USTVAntrag
         cbxRGretour.Checked = USTV_ANTRAG.UStVAn_RGRetour
         cbxSicherheit.Checked = USTV_ANTRAG.UStVAn_Sicherheit
 
+        txtErstattung.Text = CDbl(SQL.getValueTxtBySql("SELECT SUM(dbo.tblUStVErstattung.UStVEr_USteuerbetragEUR) FROM dbo.tblUStVErstattung WHERE dbo.tblUStVErstattung.UStVAn_ID = " & USTV_ANTRAG.UStVAn_ID, "FMZOLL",,, "0"))
+
     End Sub
 
     Sub getValue(ByRef USTV_ANTRAG As VERAG_PROG_ALLGEMEIN.cUSTVAntrag, Optional ADR As cAdressen = Nothing, Optional FIRMA As cFirmen = Nothing)
@@ -2043,13 +2045,19 @@ Public Class frmMDM_USTVAntrag
         If UStVPo_ID > 0 Then
             Dim ANTR_POS As New VERAG_PROG_ALLGEMEIN.cUStVPositionen(USTV_ANTRAG.UStVAn_ID, UStVPo_ID)
 
-            Dim ANTR_Leistender As New VERAG_PROG_ALLGEMEIN.cUStVLeistender(ANTR_POS.UStVPo_Leistender)
-            If Not IsDBNull(ANTR_POS.UStVPo_LeistenderId) AndAlso ANTR_POS.UStVPo_LeistenderId > 0 Then
-                ANTR_Leistender = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(ANTR_POS.UStVPo_LeistenderId)
+            If ANTR_POS.UStVPo_Leistender IsNot Nothing Then
+                Dim ANTR_Leistender As New VERAG_PROG_ALLGEMEIN.cUStVLeistender(ANTR_POS.UStVPo_Leistender)
+                If Not IsDBNull(ANTR_POS.UStVPo_LeistenderId) AndAlso ANTR_POS.UStVPo_LeistenderId > 0 Then
+                    ANTR_Leistender = New VERAG_PROG_ALLGEMEIN.cUStVLeistender(ANTR_POS.UStVPo_LeistenderId)
+                End If
+                UstCntlUSTV_AntragPosition1.Enabled = True
+                UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz, ANTR_Leistender, atez_api)
+            Else
+                UstCntlUSTV_AntragPosition1.Enabled = True
+                UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz, Nothing, atez_api)
             End If
 
-            UstCntlUSTV_AntragPosition1.Enabled = True
-            UstCntlUSTV_AntragPosition1.setValues(USTV_ANTRAG.UStVAn_KuNr, ANTR_POS, Antrag_LandKz, ANTR_Leistender, atez_api)
+
         Else
             UstCntlUSTV_AntragPosition1.reset()
             UstCntlUSTV_AntragPosition1.Enabled = False
@@ -3142,7 +3150,7 @@ Public Class frmMDM_USTVAntrag
             USTV_POS.UStVPo_Zeitstempel = Now()
             If USTV_POS.SAVE() Then
                 init()
-                dgvUSTVPositionen.SetOrder()
+                'dgvUSTVPositionen.SetOrder()
             Else
 
             End If
@@ -5390,21 +5398,30 @@ Public Class frmMDM_USTVAntrag
 
     End Function
 
-    Private Sub txtRZ_ValueChanged() Handles txtRZ.TextChanged, txtVZ.TextChanged
+    Private Sub txtRZ_ValueChanged() Handles txtRZ.TextChanged, txtVZ.TextChanged, txtErstattung.TextChanged
+
         Dim VZ As Double = 0
         Dim RZ As Double = 0
+        Dim ERST 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
+        If txtRZ.Text <> "" AndAlso IsNumeric(txtRZ.Text) Then
+            RZ = CDbl(txtRZ.Text)
+        End If
 
+        If txtErstattung.Text <> "" AndAlso IsNumeric(txtErstattung.Text) Then
+            ERST = CDbl(txtErstattung.Text)
+        End If
+
+        Dim offenerBetrag As Double = VZ - RZ - ERST
+        If offenerBetrag < 0 Then offenerBetrag = 0
+
+        txtVZOffen.Text = offenerBetrag.ToString
+
+    End Sub
 
 
     Public Shared Function rearangePosNrByLeistender(UStVAn_ID As Integer)

SDL/USTV/ustCntlUSTV_AntragPosition.vb

@@ -52,14 +52,6 @@ Public Class ustCntlUSTV_AntragPosition
 
         InitLeistenderSearchBox()
 
-        'Dim filter As String = "UstV_aktiv = 1"
-        'If Antrag_LandKz <> "" AndAlso cbxAntragsfilter.Checked Then
-        '    filter &= " and left(UstV_Leistender_UstNr,2)='" & Antrag_LandKz & "'"
-        '    sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender]) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
-        'Else
-        '    sbLeistender.initSearchBox(Me.FindForm, "[UStV_LeistenderId],[UStV_Leistender], ([UStV_Leistender]) as Leistender,[UstV_Leistender_PLZ] as PLZ, ([UstV_Leistender_Strasse] + ' ' +[UstV_Leistender_StrasseNr]) as Strasse, [UstV_Leistender_Stadt] as Stadt  FROM [tblUStVLeistender]", {"UStV_Leistender", "UstV_Leistender_UstNr"}, filter, "UStV_Leistender", "UStV_LeistenderId", "Leistender", "FMZOLL",, 400, 200, {"UStV_Leistender", "UStV_LeistenderId"})
-        'End If
-
     End Sub
 
     Sub setValues(kdnr As Integer, UStV_POS As VERAG_PROG_ALLGEMEIN.cUStVPositionen, Antrag_LandKz As String, UStV_Leitender As VERAG_PROG_ALLGEMEIN.cUStVLeistender, atez_api As cATEZ_NCTS_IN)
@@ -89,12 +81,21 @@ Public Class ustCntlUSTV_AntragPosition
         txtNettobetragEUR.Text = ValueOrEmpty(UStV_POS.UStVPo_NettobetragEUR)
         lblSachbearbeiter.Text = ValueOrEmpty(UStV_POS.UStVPo_Sachbearbeiter)
 
-        sbLeistender.Text = UStV_Leitender.UStV_Leistender
-        If IsNumeric(UStV_Leitender.UStV_LeistenderId) Then
-            sbLeistender._value = UStV_Leitender.UStV_LeistenderId
+        If UStV_Leitender IsNot Nothing Then
+            sbLeistender.Text = UStV_Leitender.UStV_Leistender
+            If IsNumeric(UStV_Leitender.UStV_LeistenderId) AndAlso UStV_Leitender.UStV_LeistenderId > 0 Then
+                sbLeistender._value = UStV_Leitender.UStV_LeistenderId
+                sbLeistender_VALUE_CHANGED()
+            Else
+                sbLeistender._value = ""
+            End If
+            sbLeistender._value = ""
+        Else
+            sbLeistender._value = ""
         End If
 
-        sbLeistender_VALUE_CHANGED()
+
+
         loadChangedDSToPanel(UStV_Leitender, True)
         API = atez_api
 
@@ -238,7 +239,7 @@ Public Class ustCntlUSTV_AntragPosition
             UStV_POS.UStVPo_Leistender = UStV_Leist.UStV_Leistender
             If UStV_Leist.UStV_LeistenderId > 0 Then UStV_POS.UStVPo_LeistenderId = UStV_Leist.UStV_LeistenderId
         Else
-            'save = False
+            UStV_POS.UStVPo_Leistender = Nothing
         End If
 
         UStV_POS.UStVPo_Schnittstelle = cbxAPI.Checked
@@ -308,30 +309,6 @@ Public Class ustCntlUSTV_AntragPosition
 
     End Function
 
-    'Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtLeistungsbezeichnung.TextChanged, txtRgDatum.TextChanged, txtRgNr.TextChanged, txtUSTBetrag.TextChanged, txtUmrechnungskurs.TextChanged, txtUSTBetragEUR.TextChanged
-
-    '    If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_USTVA_bearbeiten", Me.FindForm) Then Exit Sub
-
-    '    If _gridAktiv And Me.FindForm IsNot Nothing Then
-
-    '        'If sender Is txtLieferung Then
-    '        '    If Not PROG.checkSDLNrPartnerKdNr(kdNr, SDLNr) Then MsgBox("Bitte geben Sie die Partner-Kundennummer im Kundenblatt oder im FM-ZOLL ein!")
-    '        'End If
-
-    '        If sender Is cboLeistungsgeber AndAlso cboLeistungsgeber.SelectedItem <> "" Then
-    '            'UStV_POS.UStVPo_Leistender = cboLeistungsgeber.SelectedItem
-    '            'values_changed()
-
-    '        Else
-    '            'txtChanged = True
-    '        End If
-    '    End If
-
-
-
-
-    'End Sub
-
     Sub values_changed()
         lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
         lblAenderungsdatum.Text = Now.ToString("dd.MM.yyyy HH:mm")
@@ -901,9 +878,7 @@ Public Class ustCntlUSTV_AntragPosition
 
         If String.IsNullOrWhiteSpace(supplierText) Then
 
-            If UStV_POS IsNot Nothing AndAlso
-           (UStV_POS.UStVPo_Leistender <> "" OrElse
-            UStV_POS.UStVPo_LeistenderId <> 0) Then
+            If UStV_POS IsNot Nothing AndAlso (UStV_POS.UStVPo_Leistender <> "" OrElse UStV_POS.UStVPo_LeistenderId <> 0) Then
 
                 UStV_Leist = Nothing
                 loadChangedDSToPanel(Nothing, True)

VERAG_PROG_ALLGEMEIN/Classes/USTV/cUStVLeistender.vb

@@ -19,16 +19,19 @@ Public Class cUStVLeistender
         Dim SQL As New SQL
 
     Sub New(UStV_Leistender As String, Optional searchbyUID As Boolean = False)
-        If Not searchbyUID Then
-            Me.UStV_Leistender = UStV_Leistender
-            LOAD()
+        If UStV_Leistender <> "" Then
+            If Not searchbyUID Then
+                Me.UStV_Leistender = UStV_Leistender
+                LOAD()
 
-        Else
-            Me.UstV_Leistender_UstNr = UStV_Leistender
-            LOADBYUID()
+            Else
+                Me.UstV_Leistender_UstNr = UStV_Leistender
+                LOADByUID()
 
+            End If
         End If
 
+
     End Sub
 
     Sub New(Id As Integer)