Fakt USTVA

2025-05-05 11:54:05 +02:00
parent 662a06dcc2
commit 5b05aeda34
4 changed files with 86 additions and 42 deletions
--- a/SDL/Fakturierung/frmAbrechnungsMaskeEinzeln.vb
+++ b/SDL/Fakturierung/frmAbrechnungsMaskeEinzeln.vb
@@ -53,17 +53,15 @@

        ElseIf RK_ID > 0 Then

-            Dim dt As DataTable = SQL.loadDgvBySql("select top(1) FilialenNr, AbfertigungsNr from Rechnungsausgang where RK_ID = " & RK_ID, "FMZOLL")
+            'Dim dt As DataTable = SQL.loadDgvBySql("select top(1) FilialenNr, AbfertigungsNr from Rechnungsausgang where RK_ID = " & RK_ID, "FMZOLL")

-            If dt.Rows.Count > 0 Then
+            'If dt.Rows.Count > 0 Then

-                UsrCntlFaktAbrechnung1.cboFiliale.changeItem(dt.Rows(0).Item("FilialenNr"))
-                UsrCntlFaktAbrechnung1.txtAbfertigungsnummer.Text = dt.Rows(0).Item("AbfertigungsNr")
-                UsrCntlFaktAbrechnung1.cboSpedBuchUnterNr.Focus()
+            UsrCntlFaktAbrechnung1.initRECHNUNG(RK_ID)
+
+                'End If

            End If
-
-        End If
    End Sub


--- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb
@@ -27,6 +27,7 @@ Partial Class frmMDM_USTVAntrag
        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.pnlBottom = New System.Windows.Forms.Panel()
+        Me.pb_Beleg = New System.Windows.Forms.PictureBox()
        Me.Button5 = New System.Windows.Forms.Button()
        Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label27 = New System.Windows.Forms.Label()
@@ -106,7 +107,9 @@ 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()
        Me.btnPDFauslesen = New System.Windows.Forms.Button()
        Me.btnEintragloeschen = New System.Windows.Forms.Button()
@@ -115,16 +118,15 @@ 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()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.cnS_KIUPLOAD = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.UstCntlUSTV_AntragPosition1 = New SDL.ustCntlUSTV_AntragPosition()
-        Me.UstCntlUSTV_AntragErstattungen1 = New SDL.ustCntlUSTV_ErstattungPosition()
-        Me.cbxKIUploaddelete = New System.Windows.Forms.CheckBox()
        Me.pnlBottom.SuspendLayout()
+        CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picExcel, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.pnlHeader.SuspendLayout()
@@ -151,6 +153,7 @@ Partial Class frmMDM_USTVAntrag
        '
        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.pb_Beleg)
        Me.pnlBottom.Controls.Add(Me.Button5)
        Me.pnlBottom.Controls.Add(Me.txtSumme)
        Me.pnlBottom.Controls.Add(Me.Label27)
@@ -168,6 +171,17 @@ Partial Class frmMDM_USTVAntrag
        Me.pnlBottom.Size = New System.Drawing.Size(1454, 100)
        Me.pnlBottom.TabIndex = 3
        '
+        'pb_Beleg
+        '
+        Me.pb_Beleg.Image = Global.SDL.My.Resources.Resources.pdf
+        Me.pb_Beleg.Location = New System.Drawing.Point(899, 60)
+        Me.pb_Beleg.Name = "pb_Beleg"
+        Me.pb_Beleg.Size = New System.Drawing.Size(35, 35)
+        Me.pb_Beleg.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.pb_Beleg.TabIndex = 51
+        Me.pb_Beleg.TabStop = False
+        Me.pb_Beleg.Visible = False
+        '
        'Button5
        '
        Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -1379,6 +1393,14 @@ Partial Class frmMDM_USTVAntrag
        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
@@ -1394,6 +1416,19 @@ Partial Class frmMDM_USTVAntrag
        Me.Panel4.Size = New System.Drawing.Size(154, 261)
        Me.Panel4.TabIndex = 0
        '
+        'cbxKIUploaddelete
+        '
+        Me.cbxKIUploaddelete.AutoSize = True
+        Me.cbxKIUploaddelete.Checked = True
+        Me.cbxKIUploaddelete.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxKIUploaddelete.ForeColor = System.Drawing.Color.Black
+        Me.cbxKIUploaddelete.Location = New System.Drawing.Point(6, 231)
+        Me.cbxKIUploaddelete.Name = "cbxKIUploaddelete"
+        Me.cbxKIUploaddelete.Size = New System.Drawing.Size(149, 17)
+        Me.cbxKIUploaddelete.TabIndex = 51
+        Me.cbxKIUploaddelete.Text = "PDF nach KI-Upl. löschen"
+        Me.cbxKIUploaddelete.UseVisualStyleBackColor = True
+        '
        'scanUSTVA
        '
        Me.scanUSTVA._ARCHIV = True
@@ -1511,6 +1546,14 @@ Partial Class frmMDM_USTVAntrag
        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
@@ -1566,35 +1609,6 @@ Partial Class frmMDM_USTVAntrag
        Me.cnS_KIUPLOAD.Name = "ContextMenuStrip1"
        Me.cnS_KIUPLOAD.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(154, 0)
-        Me.UstCntlUSTV_AntragPosition1.Name = "UstCntlUSTV_AntragPosition1"
-        Me.UstCntlUSTV_AntragPosition1.Size = New System.Drawing.Size(1282, 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(1280, 259)
-        Me.UstCntlUSTV_AntragErstattungen1.TabIndex = 2
-        '
-        'cbxKIUploaddelete
-        '
-        Me.cbxKIUploaddelete.AutoSize = True
-        Me.cbxKIUploaddelete.Checked = True
-        Me.cbxKIUploaddelete.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxKIUploaddelete.ForeColor = System.Drawing.Color.Black
-        Me.cbxKIUploaddelete.Location = New System.Drawing.Point(6, 231)
-        Me.cbxKIUploaddelete.Name = "cbxKIUploaddelete"
-        Me.cbxKIUploaddelete.Size = New System.Drawing.Size(149, 17)
-        Me.cbxKIUploaddelete.TabIndex = 51
-        Me.cbxKIUploaddelete.Text = "PDF nach KI-Upl. löschen"
-        Me.cbxKIUploaddelete.UseVisualStyleBackColor = True
-        '
        'frmMDM_USTVAntrag
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1610,6 +1624,7 @@ Partial Class frmMDM_USTVAntrag
        Me.Text = "USTV Antrag"
        Me.pnlBottom.ResumeLayout(False)
        Me.pnlBottom.PerformLayout()
+        CType(Me.pb_Beleg, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.picExcel, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.picPDF, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlHeader.ResumeLayout(False)
@@ -1738,4 +1753,5 @@ Partial Class frmMDM_USTVAntrag
    Friend WithEvents scanUSTVA As VERAG_PROG_ALLGEMEIN.usrcntlPDFScan
    Friend WithEvents cnS_KIUPLOAD As ContextMenuStrip
    Friend WithEvents cbxKIUploaddelete As CheckBox
+    Friend WithEvents pb_Beleg As PictureBox
 End Class
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -1,6 +1,7 @@
 Imports System.IO
 Imports System.Reflection
 Imports System.Windows.Documents
+Imports com.sun.org.apache.xpath.internal.objects
 Imports itextsharp.text.pdf
 Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN
@@ -268,6 +269,14 @@ Public Class frmMDM_USTVAntrag
            If USTV_ANTRAG.FilialenNr IsNot Nothing AndAlso USTV_ANTRAG.FilialenNr > 0 AndAlso USTV_ANTRAG.AbfertigungsNr IsNot Nothing AndAlso USTV_ANTRAG.AbfertigungsNr > 0 Then
                Dim spedBuch As New cSpeditionsbuch(USTV_ANTRAG.FilialenNr, USTV_ANTRAG.AbfertigungsNr, 0)
                If spedBuch.hasEntry Then
+
+                    If CInt(SQL.getValueTxtBySql("select COUNT(*) from Rechnungsausgang where FilialenNr = " & USTV_ANTRAG.FilialenNr & " and AbfertigungsNr = " & USTV_ANTRAG.AbfertigungsNr & " and Firma_ID = 19 and DruckDatumZeit is not null", "FMZOLL",,, "0")) > 0 Then
+                        pb_Beleg.Visible = True
+                    Else
+                        pb_Beleg.Visible = False
+
+                    End If
+
                    Button4.Text = "Sped.-Buch anzeigen"
                    Button5.Visible = True
                Else
@@ -2935,8 +2944,19 @@ Public Class frmMDM_USTVAntrag
        If IsDBNull(USTV_ANTRAG.FilialenNr) OrElse USTV_ANTRAG.FilialenNr Is Nothing OrElse USTV_ANTRAG.FilialenNr = 0 Then MsgBox("Für das Speditionsbuch muss die Filiale eingegeben werden.") : Exit Sub
        If IsDBNull(USTV_ANTRAG.AbfertigungsNr) OrElse USTV_ANTRAG.AbfertigungsNr Is Nothing OrElse USTV_ANTRAG.AbfertigungsNr <= 0 Then MsgBox("Für das Speditionsbuch muss die Abfertigungs-Nr eingegeben werden.") : Exit Sub

-        Dim f As New SDL.frmAbrechnungsMaskeEinzeln(USTV_ANTRAG.FilialenNr, USTV_ANTRAG.AbfertigungsNr, IIf(USTV_ANTRAG.UStVAn_ErstattungsbetragEUR >= 0, "AG", "AR"))
-        f.Show(Me)
+        Dim RK_ID As Integer = CInt(SQL.getValueTxtBySql("select top(1) RK_ID from Rechnungsausgang where FilialenNr = " & USTV_ANTRAG.FilialenNr & " and AbfertigungsNr = " & USTV_ANTRAG.AbfertigungsNr & " and Firma_ID = 19", "FMZOLL", ,, "0"))
+
+        If RK_ID > 0 Then
+            Dim f As New SDL.frmAbrechnungsMaskeEinzeln(RK_ID)
+            f.Show(Me)
+
+        Else
+
+            Dim f As New SDL.frmAbrechnungsMaskeEinzeln(USTV_ANTRAG.FilialenNr, USTV_ANTRAG.AbfertigungsNr, IIf(USTV_ANTRAG.UStVAn_ErstattungsbetragEUR >= 0, "AG", "AR"))
+            f.Show(Me)
+
+        End If
+

    End Sub

@@ -3057,7 +3077,17 @@ Public Class frmMDM_USTVAntrag

    End Sub

+    Private Sub pb_Beleg_Click(sender As Object, e As EventArgs) Handles pb_Beleg.Click

+        Dim RK_ID As Integer = CInt(SQL.getValueTxtBySql("select top(1) RK_ID from Rechnungsausgang where FilialenNr = " & USTV_ANTRAG.FilialenNr & " and AbfertigungsNr = " & USTV_ANTRAG.AbfertigungsNr & " and DruckDatumZeit is not null and Firma_ID = 19", "FMZOLL", ,, "0"))
+
+        If RK_ID > 0 Then
+            Dim RG_PATH = ""
+            cFakturierung.doRechnungsDruck_SRorER(RK_ID,, False, 4, RG_PATH,,, True)
+            Process.Start(RG_PATH)
+        End If
+
+    End Sub

    Private Sub initScanUSTVA()
        If USTV_ANTRAG IsNot Nothing Then
--- a/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb
@@ -1103,7 +1103,7 @@ Public Class cMDMFunctionsAllgemein
                header2 = "VAT NO.: " & USTV_ANTRAG.UStVAn_Steuernummer & "    " & "Name/Company: " & AD.Name_1 & " " & AD.Name_2 & "   " & "VAT in " & Antrag_LandKz & ": " & SteuerNR
            End If

-            Return cProgramFunctions.genExcelFromDT_NEW_(dtNew, {"K1:K" & (dtNew.Rows.Count + 1)},, header1, header2, IIf(USTV_ANTRAG.UStVAn_Währungscode = "EUR", "€", ""), True, "J", True,, openFile)
+            Return cProgramFunctions.genExcelFromDT_NEW_(dtNew, {"K1:K" & (dtNew.Rows.Count + 1)},, header1, header2, IIf(USTV_ANTRAG.UStVAn_Währungscode = "EUR", "€", ""), True, "J", True, True, openFile)

        End If