ustva, fakt, etc.

VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb

@@ -62,6 +62,7 @@ Public Class cUSTVAntrag
     Property UStVAn_Sicherheit As Object = Nothing
     Property UStVAn_MWSTEingang_offen As Object = Nothing
     Property POSITIONEN As New List(Of cUStVPositionen) '= Nothing
+    Property UStVAn_letzteAenderung As Object = Nothing
 
     Public hasEntry = False
 
@@ -133,6 +134,7 @@ Public Class cUSTVAntrag
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_VZoffen", UStVAn_VZoffen)) '
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_Sicherheit", UStVAn_Sicherheit))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_MWSTEingang_offen", UStVAn_MWSTEingang_offen))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("UStVAn_letzteAenderung", UStVAn_letzteAenderung))
 
 
         Return list
@@ -322,6 +324,18 @@ Public Class cUSTVAntrag
         Return -1
     End Function
 
+    Public Function hasVZalreadyBilled() As Boolean
+        Try
+
+
+            Return SQL.getValueTxtBySql("SELECT count(*) FROM tblUStVPositionen where UStVAn_ID=" & UStVAn_ID & " and UStVPo_VZ = 1 and UStVPo_VZ_RKID is not null", "FMZOLL",,, "0") > 0
+
+        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 False
+    End Function
+
 
 
     Public Function DELETE() As Boolean

VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb

@@ -1098,7 +1098,7 @@ Public Class cMDMFunctionsAllgemein
 
     End Function
 
-    Shared Function generatePosList(USTV_ANTRAG As cUSTVAntrag, posId As String, Antrag_LandKz As String, SteuerNR As String, openFile As Boolean, type As String, ByRef dt As DataTable, Optional isVZ As Boolean = False, Optional RK_ID As Integer = -1) As String
+    Shared Function generatePosList(USTV_ANTRAG As cUSTVAntrag, posId As String, Antrag_LandKz As String, SteuerNR As String, openFile As Boolean, type As String, ByRef dt As DataTable, Optional isVZ As Boolean = False, Optional RK_ID As Integer = -1, Optional hasVZalredyBilled As Boolean = False) As String
 
         Dim sql As New SQL
 
@@ -1107,6 +1107,8 @@ Public Class cMDMFunctionsAllgemein
             sqlWHere = " And UStVPo_ID in(" & posId & ")"
         ElseIf isVZ Then
             sqlWHere = " and UStVPo_VZ = 1 And (UStVPo_VZ_RKID is null" & IIf(RK_ID > 0, " or UStVPo_VZ_RKID = " & RK_ID & ")", ")")
+        ElseIf hasVZalredyBilled Then
+            sqlWHere = " and isnull(UStVPo_VZ,0) = 0 And UStVPo_VZ_RKID is null "
         End If
 
         Dim StringSQL = "SELECT [UStVPo_ID] as Number ,[UStVPo_ReDat] as 'Date of Invoice',[UStVPo_ReNr] as 'Number of invoice' ,[UStVPo_Leistungsbezeichnung] as 'Name of service',[UStVPo_Leistender] as 'Name of supplier',leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as Street,
@@ -1164,9 +1166,9 @@ Public Class cMDMFunctionsAllgemein
                     End If
 
                     header2 = "VAT NO.: " & USTV_ANTRAG.UStVAn_Steuernummer & "    " & "Name/Company: " & AD.Name_1 & " " & AD.Name_2 & "   " & "VAT in " & Antrag_LandKz & ": " & SteuerNR
-                    End If
+                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, 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)
 
             Else
 

VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb

@@ -464,9 +464,14 @@ Public Class cRechnungsausgang
     End Function
 
 
-    Public Function SAVE_DruckDatumZeit() As Boolean
+    Public Function SAVE_DruckDatumZeit(Optional sendmanuell As Boolean = False, Optional isAutoMail As Boolean = False) As Boolean
         Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
-        Dim sqlstr = " UPDATE Rechnungsausgang SET DruckDatumZeit=@DruckDatumZeit WHERE RK_ID=@RK_ID "
+        Dim SQLStringZusatz = ""
+
+        If isAutoMail AndAlso sendmanuell Then
+            SQLStringZusatz = ", Automailversand_sent=@DruckDatumZeit"
+        End If
+        Dim sqlstr = " UPDATE Rechnungsausgang SET DruckDatumZeit=@DruckDatumZeit " & SQLStringZusatz & " WHERE RK_ID=@RK_ID "
         Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
     End Function