Stuff

VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb

@@ -86,7 +86,7 @@ Public Class cMDMFunctionsAllgemein
         End Try
     End Function
 
-    Shared Function UStVAKunden_SummenNeuBerechnen(Optional KundenNr As Integer = 0, Optional saveValues As Boolean = True, Optional dt As DataTable = Nothing) As Boolean
+    Shared Function UStVAKunden_SummenNeuBerechnen(Optional KundenNr As Integer = 0, Optional saveValues As Boolean = True, Optional dt As DataTable = Nothing, Optional sendMail As Boolean = False) As Boolean
         Try
 
             Dim sumChangedPLOSEOK As Boolean = True
@@ -231,7 +231,7 @@ Public Class cMDMFunctionsAllgemein
                         End If
                     End If
 
-                    If KundenNr > 0 AndAlso dt IsNot Nothing Then
+                    If (KundenNr > 0 Or sendMail) AndAlso dt IsNot Nothing Then
 
                         dt.Columns.Add("KundenNr", GetType(String))
                         dt.Columns.Add("VorschaubetragEUR", GetType(Double))
@@ -247,7 +247,7 @@ Public Class cMDMFunctionsAllgemein
                         dt.Columns.Add("VZBetragEUR", GetType(Double))
 
                         Dim ro As DataRow = dt.NewRow
-                        ro("KundenNr") = KundenNr
+                        ro("KundenNr") = IIf(KundenNr > 0, KundenNr, r.Item("KundenNr"))
                         ro("VorschaubetragEUR") = curUStV_SummeVorschaubetragEUR
                         ro("VorschaubetragEUR_VERAG") = curUStV_SummeVorschaubetragEUR_VERAG
                         ro("VorschaubetragEUR_IDS") = curUStV_SummeVorschaubetragEUR_IDS

VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb

@@ -1007,7 +1007,7 @@ Public Class cMSEAPI
 
                         End If
 
-                        inv.SAVE()
+                        If Not inv.archiv Then inv.SAVE() 'bereits archiverte REchnungen nicht überschreiben!!!!
                     End If
 
                     j = j + 1
@@ -1422,11 +1422,14 @@ Public Class cMSEInvoices
     Property total_vat_amount_euro As Object = Nothing
     Property msts_vat_number As Object = Nothing
     Property invoice_id As Object = Nothing
+    Property invoice_nr As Object = Nothing
     Property invoice_date As Object = Nothing
     Property customer_number As Object = Nothing
     Property country As Object = Nothing
     Property imported As Boolean = False
     Property daId As Object = Nothing
+    Property archiv As Boolean = False
+    Property archiviertDatum As Object = Nothing
 
     Public hasEntry = False
 
@@ -1453,6 +1456,9 @@ Public Class cMSEInvoices
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("country", country))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("imported", imported))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daId", daId))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("archiv", archiv))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("archiviertDatum", archiviertDatum))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("invoice_nr", invoice_nr))
 
         Return list
     End Function