Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

2023-10-11 13:27:56 +02:00
parent aa26988458 5867cf5060
commit df341a7910
17 changed files with 1402 additions and 157 deletions
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -1315,7 +1315,7 @@ Public Class cFakturierung
                            Return False
                        End If
                    Else
-                        MsgBox("Fehler: Kein Rechnugsempfänger gefunden!")
+                        MsgBox("Fehler: Kein Rechnungsempfänger gefunden!")
                        Return False
                    End If
                Else
@@ -1325,6 +1325,10 @@ Public Class cFakturierung
                    End If
                End If

+                If Not RECHNUNG.checkRechnungsNrIsSet() Then
+                    MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen")
+                    Return False
+                End If

                'Rechnugnsdruck  =  Individuell für deise Rechnung, wird optional mitgegeben
                ' Dim RG_Bezeichnung = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "_Rechnung_" & If(RECHNUNG.RechnungsNr, "") & ".pdf"
@@ -1450,7 +1454,7 @@ Public Class cFakturierung
                            End If

                        Catch ex As Exception
-                            MsgBox("Fehler bim Öffnen des Mail-Programmes. PDF wird geladen!")
+                            MsgBox("Fehler beim Öffnen des Mail-Programmes. PDF wird geladen!")
                            Process.Start(tmpPath)
                        End Try
                        rpt.Dispose()
@@ -2065,7 +2069,14 @@ Public Class cFakturierung
                    End If
                    RG.SAVE()

-                    found = True
+
+                    If Not RG.checkRechnungsNrIsSet() Then
+                        MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen")
+                        Return False
+                    Else
+                        found = True
+                    End If
+
                End If
            Next

@@ -2076,6 +2087,7 @@ Public Class cFakturierung
                If path <> "" Then listPDFs.Add(path)
            End If
            lastAktuelle_RgNr = Aktuelle_RgNr
+
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
        End Try
--- a/SDL/Fakturierung/frmFaktEmail.vb
+++ b/SDL/Fakturierung/frmFaktEmail.vb
@@ -275,9 +275,10 @@ Public Class frmFaktEmail
                    Dim lastAktuelle_RgNr As Integer = -1
                    'Rechnung erstellen:
                    '-----------------------------------------------------------------
+                    Dim RechnungsNrisSet As Boolean = False
                    Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr)
                    If RechnungsNr <= 0 Then
-                        cFakturierung.doSAMMELRechnungsDruck(Firma_ID, SammelrechungArt, DatumBis, Rechnungsdatum, "", EinzelAnlagen, Sammelbericht, KdNr, 4, listPDFs, SB, lastAktuelle_RgNr, DruckDatumZeit, AvisoIds, cbxExcelEvolog.Checked, SonstAnlagen,, cbxTransFerry.Checked, FakturierungsGruppe, Abfertigungsart)
+                        RechnungsNrisSet = cFakturierung.doSAMMELRechnungsDruck(Firma_ID, SammelrechungArt, DatumBis, Rechnungsdatum, "", EinzelAnlagen, Sammelbericht, KdNr, 4, listPDFs, SB, lastAktuelle_RgNr, DruckDatumZeit, AvisoIds, cbxExcelEvolog.Checked, SonstAnlagen,, cbxTransFerry.Checked, FakturierungsGruppe, Abfertigungsart)
                        RechnungsNr = lastAktuelle_RgNr
                    Else
                        Dim path = ""
@@ -287,6 +288,9 @@ Public Class frmFaktEmail
                        listPDFs.Add(path)
                    End If

+                    If Not RechnungsNrisSet Then 'Abbruch bei fehlender RE-Nr
+                        Exit Sub
+                    End If

                    If cbxRgKopieDrucken.Checked Then
                        'KOPIE DRUCK
@@ -299,83 +303,83 @@ Public Class frmFaktEmail
                    End If

                    Dim outl As New Outlook.Application
-                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
-                    Mail = outl.CreateItem(0)
-                    Mail.Subject = txtSubject.Text
+                        Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+                        Mail = outl.CreateItem(0)
+                        Mail.Subject = txtSubject.Text


-                    'Mail-Adressen eintragen
-                    '-----------------------------------------------------------------
-                    For Each r In dgvEmail.Rows
-                        If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";"
-                    Next
-                    For Each r In dgvEmailCC.Rows
-                        If r.cells(0).value <> "" Then Mail.CC &= r.cells(0).value & ";"
-                    Next
-                    For Each r In dgvEmailBCC.Rows
-                        If r.cells(0).value <> "" Then Mail.BCC &= r.cells(0).value & ";"
-                    Next
-
-
-                    RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", lastAktuelle_RgNr)
-                    txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
-
-
-                    Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine) & "</div>"
-
-                    Mail.HTMLBody = TextHTML
-                    Mail.Subject = txtSubject.Text
-
-                    ATTACHMENTS.Clear()
-                    '-----------------------------------------------------------------
-                    'Rechnungen anfügen
-                    '-----------------------------------------------------------------
-                    For Each l In listPDFs
-                        '    Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
-                        ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
-                    Next
-                    For Each l In SonstAnlagen
-                        '    Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
-                        ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
-                    Next
-                    addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)
-
-                    '-----------------------------------------------------------------
-                    'Steuerbescheid/VDB anfügen
-                    '-----------------------------------------------------------------
-                    getAnhaenge()
-                    'For Each l In listPDFs
-                    '    '    Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
-                    '    ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
-                    'Next 
-
-                    'Rechnungsanhänge anfügen
-                    '-----------------------------------------------------------------
-                    If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
-                        For Each r In SR_DT.Rows
-                            Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
-                            If RG_ANH IsNot Nothing Then
-                                For Each ANH In RG_ANH
-                                    ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
-                                Next
-                            End If
+                        'Mail-Adressen eintragen
+                        '-----------------------------------------------------------------
+                        For Each r In dgvEmail.Rows
+                            If r.cells(0).value <> "" Then Mail.To &= r.cells(0).value & ";"
                        Next
+                        For Each r In dgvEmailCC.Rows
+                            If r.cells(0).value <> "" Then Mail.CC &= r.cells(0).value & ";"
+                        Next
+                        For Each r In dgvEmailBCC.Rows
+                            If r.cells(0).value <> "" Then Mail.BCC &= r.cells(0).value & ";"
+                        Next
+
+
+                        RichTextBox.Text = RichTextBox.Text.Replace("%RgNr%", lastAktuelle_RgNr)
+                        txtSubject.Text = txtSubject.Text.Replace("%RgNr%", lastAktuelle_RgNr)
+
+
+                        Dim TextHTML = "<div style=""font-family:Calibri, Arial"">" & RichTextBox.Text.Replace(ControlChars.Lf, "<br>") & cFakturierung.getSignature(AD.LandKz, Firma_ID,,,, additionalLine) & "</div>"
+
+                        Mail.HTMLBody = TextHTML
+                        Mail.Subject = txtSubject.Text
+
+                        ATTACHMENTS.Clear()
+                        '-----------------------------------------------------------------
+                        'Rechnungen anfügen
+                        '-----------------------------------------------------------------
+                        For Each l In listPDFs
+                            '    Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                            ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
+                        Next
+                        For Each l In SonstAnlagen
+                            '    Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                            ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
+                        Next
+                        addAttachments(Mail, lastAktuelle_RgNr, cbxMergeRg.Checked)
+
+                        '-----------------------------------------------------------------
+                        'Steuerbescheid/VDB anfügen
+                        '-----------------------------------------------------------------
+                        getAnhaenge()
+                        'For Each l In listPDFs
+                        '    '    Mail.Attachments.Add(l, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+                        '    ATTACHMENTS.Add(New cFakt_MailATTach(l, ""))
+                        'Next 
+
+                        'Rechnungsanhänge anfügen
+                        '-----------------------------------------------------------------
+                        If SR_DT IsNot Nothing AndAlso SR_DT.Rows.Count > 0 Then
+                            For Each r In SR_DT.Rows
+                                Dim RG_ANH = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.LOAD_ANHAENGE_LIST(r("RK_ID"))
+                                If RG_ANH IsNot Nothing Then
+                                    For Each ANH In RG_ANH
+                                        ATTACHMENTS.Add(New cFakt_MailATTach(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(ANH.dsId), ANH.Bezeichnung))
+                                    Next
+                                End If
+                            Next
+                        End If
+                        '-----------------------------------------------------------------
+
+
+                        addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
+
+
+                        Mail.Display()
+                        '------------------------------------------------------------------------------------------
+                        ' STB  /FA   SR: ABFRAGE FISKAL-VZ 
+                        If isFiskal Then
+                            send_StbFAMail(AD.AdressenNr, " Rg-Nr.: " & lastAktuelle_RgNr, lastAktuelle_RgNr)
+                        End If
+                        '------------------------------------------------------------------------------------------
+
                    End If
-                    '-----------------------------------------------------------------
-
-
-                    addAttachments(Mail, lastAktuelle_RgNr, cbxMergePDF.Checked)
-
-
-                    Mail.Display()
-                    '------------------------------------------------------------------------------------------
-                    ' STB  /FA   SR: ABFRAGE FISKAL-VZ 
-                    If isFiskal Then
-                        send_StbFAMail(AD.AdressenNr, " Rg-Nr.: " & lastAktuelle_RgNr, lastAktuelle_RgNr)
-                    End If
-                    '------------------------------------------------------------------------------------------
-
-                End If
            Catch ex As Exception
                MsgBox("Fehler beim Öffnen des Mail-Programmes." & ex.Message & ex.StackTrace)
                'Process.Start(a)
@@ -390,6 +394,8 @@ Public Class frmFaktEmail
            If RECHNUNG.Status <> 0 OrElse vbYes = MsgBox("Möchten Sie das PDF als Mail-Anhang  erstellen?" & vbNewLine & "Es wird eine Rechnungsnummer vergeben, die Rechnung gilt somit als gedruckt und kann nicht mehr bearbeitet werden.", vbYesNoCancel) Then
                abfNr = " Pos-Nr.: " & RECHNUNG.FilialenNr & "-" & RECHNUNG.AbfertigungsNr & "-" & RECHNUNG.SpeditionsbuchUnterNr

+
+
                Try
                    Dim outl As New Outlook.Application
                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
@@ -414,6 +420,12 @@ Public Class frmFaktEmail
                    If Not cFakturierung.doRechnungsDruck(RECHNUNG,,, 4, pathRG,, cbxOriginalPrint.Checked) Then
                        Exit Sub
                    End If
+
+                    'If Not RECHNUNG.checkRechnungsNrIsSet() Then
+                    '    MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen")
+                    '    Exit Sub
+                    'End If
+
                    RechnungsNr = RECHNUNG.RechnungsNr

                    If cbxRgKopieDrucken.Checked Then
--- a/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
+++ b/SDL/Fakturierung/frmFaktSammelRgDrucken.vb
@@ -254,10 +254,16 @@ Public Class frmFaktSammelRgDrucken
            Me.Cursor = Cursors.WaitCursor
            Dim listPDFs As New List(Of String)
            Dim SonstAnlagen As New List(Of String)
-            cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, If(ausgabeArt = 1, -1, 4), listPDFs, cboSB._value,,, getAvisoIds, cbxEVOLOG.Checked, SonstAnlagen, vorschau, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value)
+            Dim RechnungsNrisSet As Boolean = False
+            RechnungsNrisSet = cFakturierung.doSAMMELRechnungsDruck(cboFirma._value, Sammelrechung, CDate(txtZeitraumBis.Text), CDate(txtRechnungsdatum.Text), cboPrinter.Text, cbxEinzelAnlagen.Checked, cbxSammelbericht.Checked, getSelectionKdNr, If(ausgabeArt = 1, -1, 4), listPDFs, cboSB._value,,, getAvisoIds, cbxEVOLOG.Checked, SonstAnlagen, vorschau, cbxTransFerry.Checked, cboFaktGrp._value, cboAbfertigungsart._value)

            '-------------- für PDF-Sammel-Rechnung -------------- 

+            If Not RechnungsNrisSet Then
+                MsgBox("Rechnungsnummer wurde nicht in Datenbank eingetragen" & vbNewLine & "Vorgang wird abgebrochen")
+                Exit Sub
+            End If
+
            If cbxZusammenfassen.Checked Then ' Gibt an, ob mehrere Sammelrechnung zusammengefasst werden sollten

                Select Case ausgabeArt
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -743,6 +743,12 @@
    <Compile Include="mdm\PLOSE\rptPLOSE_CustomerConsortio.vb">
      <SubType>Component</SubType>
    </Compile>
+    <Compile Include="mdm\PLOSE\rptASFINAG_TransaktionenSumary.Designer.vb">
+      <DependentUpon>rptASFINAG_TransaktionenSumary.vb</DependentUpon>
+    </Compile>
+    <Compile Include="mdm\PLOSE\rptASFINAG_TransaktionenSumary.vb">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="mdm\SDLLeistungenDetails\usrCntlSDLLeistungenPLOSE_MEDPASS.Designer.vb">
      <DependentUpon>usrCntlSDLLeistungenPLOSE_MEDPASS.vb</DependentUpon>
    </Compile>
@@ -3114,6 +3120,9 @@
    <EmbeddedResource Include="mdm\PLOSE\rptPLOSE_CustomerConsortio.resx">
      <DependentUpon>rptPLOSE_CustomerConsortio.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="mdm\PLOSE\rptASFINAG_TransaktionenSumary.resx">
+      <DependentUpon>rptASFINAG_TransaktionenSumary.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="mdm\SDLLeistungenDetails\usrCntlSDLLeistungenPLOSE_MEDPASS.resx">
      <DependentUpon>usrCntlSDLLeistungenPLOSE_MEDPASS.vb</DependentUpon>
    </EmbeddedResource>
--- a/SDL/buchhaltung/frmBU_Mahnlauf.vb
+++ b/SDL/buchhaltung/frmBU_Mahnlauf.vb
@@ -468,7 +468,7 @@ Public Class frmBU_Mahnlauf

                        Select Case AD.LandKz
                            Case "TR"
-                                Mail_Subject = "PAYMENT REMINDER"
+                                Mail_Subject = "PAYMENT REMINDER" & IIf(KdNr > 0, " - Cust.: " & KdNr, "")
                                Mail_HTMLBody = "Sayin Bayanlar ve Baylar,<br><br>ekte baslikta yazan faturayi bulabilirsinz."
                                Mail_HTMLBody &= "<br><br><br>"
                                Mail_HTMLBody &= "<i>If you are not responsible for this matter, please send us an e-mail address to <b>buchhaltung@verag.ag</b>, 
@@ -476,7 +476,7 @@ Public Class frmBU_Mahnlauf
                                                 In the meantime, we ask you to forward them to the responsible persons in your company.</i>"
                                Mail_HTMLBody &= "<br><br><br>Saygilarimizla<br><br>" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID)
                            Case "A", "AT", "D", "DE", "CH"
-                                Mail_Subject = MAHNTEXT
+                                Mail_Subject = MAHNTEXT & IIf(KdNr > 0, " - KdNr.: " & KdNr, "")
                                Mail_HTMLBody = "Sehr geehrte Damen und Herren,<br><br>im Anhang finden Sie ihre Mahnung, mit der Bitte um Bearbeitung. "
                                Mail_HTMLBody &= "<br><br><br>"
                                Mail_HTMLBody &= "<i>Sollten Sie für diesen Sachverhalt nicht zuständig sein, teilen Sie uns bitte per Mail an <b>buchhaltung@verag.ag</b> eine Mailadresse mit, 
@@ -485,7 +485,7 @@ Public Class frmBU_Mahnlauf

                                Mail_HTMLBody &= "<br><br><br>Mit freundlichen Grüßen<br><br>" & cFakturierung.getSignature(AD.LandKz, FIRMA.Firma_ID)
                            Case Else
-                                Mail_Subject = "PAYMENT REMINDER"
+                                Mail_Subject = "PAYMENT REMINDER" & IIf(KdNr > 0, " - Cust.: " & KdNr, "")
                                Mail_HTMLBody = "Sehr geehrte Damen und Herren,<br><br>attached we send you the invoice reminder."
                                Mail_HTMLBody &= "<br><br><br>"
                                Mail_HTMLBody &= "<i>If you are not responsible for this matter, please send us an e-mail address to <b>buchhaltung@verag.ag</b>, 
--- a/SDL/frmEssensbestellungen.vb
+++ b/SDL/frmEssensbestellungen.vb
@@ -326,7 +326,7 @@ Public Class frmEssensbestellungen
        Dim SQLWhere As String = ""
        If cbxMenu._value IsNot "" Then SQLWhere = " AND [eb_kw] = '" & cbxMenu._value.ToString & "'"

-        Dim SQLString As String = "SELECT [eb_kw], [eb_mitid] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],[eb_donnerstag] ,[eb_freitag],[eb_preis], [eb_mitname], [eb_datum], [eb_anmerkung], [eb_abgerechnet]  FROM [tblEssensbestellungen] where [eb_mitid] = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'" & SQLWhere & " order by [eb_datum] desc"
+        Dim SQLString As String = "SELECT [eb_kw], [eb_mitid] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],[eb_donnerstag] ,[eb_freitag],[eb_preis], [eb_mitname], [eb_datum], [eb_anmerkung], [eb_abgerechnet], [eb_storniert] FROM [tblEssensbestellungen] where [eb_mitid] = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'" & SQLWhere & " order by [eb_datum] desc"

        dgvBestellungen.SET_SQL(SQLString, "AVISO", ,)
        dgvBestellungen.LOAD()
@@ -341,6 +341,7 @@ Public Class frmEssensbestellungen
            .Columns("eb_mitid").Visible = False
            .Columns("eb_mitname").Visible = False
            .Columns("eb_datum").Visible = False
+            .Columns("eb_storniert").Visible = False
            .Columns("eb_abteilung").Visible = False
            .Columns("eb_montag").Width = 80
            .Columns("eb_montag").HeaderText = "Montag"
@@ -368,6 +369,14 @@ Public Class frmEssensbestellungen
            If Not IsDBNull(row.Cells("eb_abgerechnet").Value) Then
                If row.Cells("eb_abgerechnet").Value Then row.DefaultCellStyle.BackColor = Color.LightGreen
            End If
+            If Not IsDBNull(row.Cells("eb_storniert").Value) Then
+                If row.Cells("eb_storniert").Value Then
+                    row.DefaultCellStyle.BackColor = Color.IndianRed
+                    row.DefaultCellStyle.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Strikeout)
+
+                End If
+            End If
+
        Next


@@ -415,7 +424,6 @@ Public Class frmEssensbestellungen
            End If
        Next

-        Dim bestellung As New cEssensbestellung(dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value, dgvBestellungen.SelectedRows(0).Cells("eb_mitid").Value)
        txtAnzahlMenu.Text = countMenus.ToString()
        txtAnzahlLaCart.Text = countlaCarte.ToString
        txtPreis.Text = (CDbl(countlaCarte) + CDbl(countMenus)) * preisProMahlzeit 'IIf(bestellung.eb_storniert, preisProMahlzeit * 0, preisProMahlzeit * 1)
--- a/SDL/kunden/usrcntlFiskaluebersicht.vb
+++ b/SDL/kunden/usrcntlFiskaluebersicht.vb
@@ -934,7 +934,7 @@ Public Class usrcntlFiskaluebersicht

        If Not checkWebsite(txtHomepage.Text) Then Exit Sub

-        Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(txtHomepage.Text) 'UU langsam....
+        Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(txtHomepage.Text, DATENVERVER_OPTIONS.TMP_PATH & Guid.NewGuid().ToString() & ".pdf") 'UU langsam....

        DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "FISKALKUNDENANHAENGE", fk.FK_Datum, "", "", "Website", kdNr)
        Dim fi As New System.IO.FileInfo(pdf)
--- a/SDL/mdm/PLOSE/rptASFINAG_TransaktionenSumary.Designer.vb
+++ b/SDL/mdm/PLOSE/rptASFINAG_TransaktionenSumary.Designer.vb
--- a/SDL/mdm/PLOSE/rptASFINAG_TransaktionenSumary.resx
+++ b/SDL/mdm/PLOSE/rptASFINAG_TransaktionenSumary.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="$this.ScriptEditorPositionForUndo" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>0, 0</value>
+  </metadata>
+  <metadata name="$this.ScriptEditorPositionForRedo" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>0, 0</value>
+  </metadata>
+</root>
--- a/SDL/mdm/PLOSE/rptASFINAG_TransaktionenSumary.vb
+++ b/SDL/mdm/PLOSE/rptASFINAG_TransaktionenSumary.vb
@@ -0,0 +1,9 @@
+Imports GrapeCity.ActiveReports 
+Imports GrapeCity.ActiveReports.Document
+
+Public Class rptASFINAG_TransaktionenSumary
+    Private Sub Detail_Format(sender As Object, e As EventArgs) Handles Detail.Format
+
+    End Sub
+
+End Class
--- a/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.Designer.vb
@@ -25,14 +25,17 @@ Partial Class frmMDMDatenverarbetiung
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMDMDatenverarbetiung))
        Me.pnl = New System.Windows.Forms.Panel()
-        Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
-        Me.btn = New System.Windows.Forms.Button()
-        Me.btnDatenLaden = New System.Windows.Forms.Button()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.dat_Sum_Von = New System.Windows.Forms.DateTimePicker()
-        Me.Label45 = New System.Windows.Forms.Label()
+        Me.Panel4 = New System.Windows.Forms.Panel()
        Me.Label46 = New System.Windows.Forms.Label()
        Me.dat_Sum_Bis = New System.Windows.Forms.DateTimePicker()
+        Me.Label45 = New System.Windows.Forms.Label()
+        Me.dat_Sum_Von = New System.Windows.Forms.DateTimePicker()
+        Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
+        Me.btn = New System.Windows.Forms.Button()
+        Me.Button7 = New System.Windows.Forms.Button()
+        Me.Button8 = New System.Windows.Forms.Button()
+        Me.btnDatenLaden = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
        Me.lbl = New System.Windows.Forms.Label()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.lblProzPruef = New System.Windows.Forms.Label()
@@ -61,9 +64,14 @@ Partial Class frmMDMDatenverarbetiung
        Me.Button3 = New System.Windows.Forms.Button()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.Button7 = New System.Windows.Forms.Button()
-        Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.pnlAsfinag = New System.Windows.Forms.Panel()
+        Me.Datum_Abrechnungsdaten = New System.Windows.Forms.DateTimePicker()
+        Me.Button9 = New System.Windows.Forms.Button()
+        Me.Button10 = New System.Windows.Forms.Button()
+        Me.cbxNichtabgerechnet = New System.Windows.Forms.CheckBox()
+        Me.cbxTestdaten = New System.Windows.Forms.CheckBox()
        Me.pnl.SuspendLayout()
+        Me.Panel4.SuspendLayout()
        Me.FlowLayoutPanel.SuspendLayout()
        Me.Panel1.SuspendLayout()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -71,11 +79,12 @@ Partial Class frmMDMDatenverarbetiung
        Me.Panel3.SuspendLayout()
        Me.Panel2.SuspendLayout()
        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.Panel4.SuspendLayout()
+        Me.pnlAsfinag.SuspendLayout()
        Me.SuspendLayout()
        '
        'pnl
        '
+        Me.pnl.Controls.Add(Me.cbxTestdaten)
        Me.pnl.Controls.Add(Me.Panel4)
        Me.pnl.Controls.Add(Me.FlowLayoutPanel)
        Me.pnl.Controls.Add(Me.btnDatenLaden)
@@ -88,6 +97,51 @@ Partial Class frmMDMDatenverarbetiung
        Me.pnl.Size = New System.Drawing.Size(1163, 100)
        Me.pnl.TabIndex = 1
        '
+        'Panel4
+        '
+        Me.Panel4.Controls.Add(Me.Label46)
+        Me.Panel4.Controls.Add(Me.dat_Sum_Bis)
+        Me.Panel4.Controls.Add(Me.Label45)
+        Me.Panel4.Controls.Add(Me.dat_Sum_Von)
+        Me.Panel4.Location = New System.Drawing.Point(0, 67)
+        Me.Panel4.Name = "Panel4"
+        Me.Panel4.Size = New System.Drawing.Size(583, 33)
+        Me.Panel4.TabIndex = 28
+        '
+        'Label46
+        '
+        Me.Label46.AutoSize = True
+        Me.Label46.Location = New System.Drawing.Point(13, 9)
+        Me.Label46.Name = "Label46"
+        Me.Label46.Size = New System.Drawing.Size(119, 13)
+        Me.Label46.TabIndex = 23
+        Me.Label46.Text = "Transaktionsdaten von:"
+        '
+        'dat_Sum_Bis
+        '
+        Me.dat_Sum_Bis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+        Me.dat_Sum_Bis.Location = New System.Drawing.Point(278, 6)
+        Me.dat_Sum_Bis.Name = "dat_Sum_Bis"
+        Me.dat_Sum_Bis.Size = New System.Drawing.Size(103, 20)
+        Me.dat_Sum_Bis.TabIndex = 24
+        '
+        'Label45
+        '
+        Me.Label45.AutoSize = True
+        Me.Label45.Location = New System.Drawing.Point(249, 9)
+        Me.Label45.Name = "Label45"
+        Me.Label45.Size = New System.Drawing.Size(23, 13)
+        Me.Label45.TabIndex = 25
+        Me.Label45.Text = "bis:"
+        '
+        'dat_Sum_Von
+        '
+        Me.dat_Sum_Von.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+        Me.dat_Sum_Von.Location = New System.Drawing.Point(143, 6)
+        Me.dat_Sum_Von.Name = "dat_Sum_Von"
+        Me.dat_Sum_Von.Size = New System.Drawing.Size(103, 20)
+        Me.dat_Sum_Von.TabIndex = 22
+        '
        'FlowLayoutPanel
        '
        Me.FlowLayoutPanel.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@@ -96,6 +150,7 @@ Partial Class frmMDMDatenverarbetiung
        Me.FlowLayoutPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.FlowLayoutPanel.Controls.Add(Me.btn)
        Me.FlowLayoutPanel.Controls.Add(Me.Button7)
+        Me.FlowLayoutPanel.Controls.Add(Me.Button8)
        Me.FlowLayoutPanel.Location = New System.Drawing.Point(139, 37)
        Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
        Me.FlowLayoutPanel.Size = New System.Drawing.Size(840, 31)
@@ -112,6 +167,28 @@ Partial Class frmMDMDatenverarbetiung
        Me.btn.Text = "PLOSE"
        Me.btn.UseVisualStyleBackColor = False
        '
+        'Button7
+        '
+        Me.Button7.BackColor = System.Drawing.Color.FloralWhite
+        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button7.Location = New System.Drawing.Point(129, 3)
+        Me.Button7.Name = "Button7"
+        Me.Button7.Size = New System.Drawing.Size(120, 23)
+        Me.Button7.TabIndex = 1
+        Me.Button7.Text = "UTA"
+        Me.Button7.UseVisualStyleBackColor = False
+        '
+        'Button8
+        '
+        Me.Button8.BackColor = System.Drawing.Color.FloralWhite
+        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button8.Location = New System.Drawing.Point(255, 3)
+        Me.Button8.Name = "Button8"
+        Me.Button8.Size = New System.Drawing.Size(120, 23)
+        Me.Button8.TabIndex = 2
+        Me.Button8.Text = "ASFINAG"
+        Me.Button8.UseVisualStyleBackColor = False
+        '
        'btnDatenLaden
        '
        Me.btnDatenLaden.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -132,40 +209,6 @@ Partial Class frmMDMDatenverarbetiung
        Me.Label1.TabIndex = 26
        Me.Label1.Text = "Lieferant:"
        '
-        'dat_Sum_Von
-        '
-        Me.dat_Sum_Von.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.dat_Sum_Von.Location = New System.Drawing.Point(143, 6)
-        Me.dat_Sum_Von.Name = "dat_Sum_Von"
-        Me.dat_Sum_Von.Size = New System.Drawing.Size(103, 20)
-        Me.dat_Sum_Von.TabIndex = 22
-        '
-        'Label45
-        '
-        Me.Label45.AutoSize = True
-        Me.Label45.Location = New System.Drawing.Point(249, 9)
-        Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(23, 13)
-        Me.Label45.TabIndex = 25
-        Me.Label45.Text = "bis:"
-        '
-        'Label46
-        '
-        Me.Label46.AutoSize = True
-        Me.Label46.Location = New System.Drawing.Point(13, 9)
-        Me.Label46.Name = "Label46"
-        Me.Label46.Size = New System.Drawing.Size(119, 13)
-        Me.Label46.TabIndex = 23
-        Me.Label46.Text = "Transaktionsdaten von:"
-        '
-        'dat_Sum_Bis
-        '
-        Me.dat_Sum_Bis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.dat_Sum_Bis.Location = New System.Drawing.Point(278, 6)
-        Me.dat_Sum_Bis.Name = "dat_Sum_Bis"
-        Me.dat_Sum_Bis.Size = New System.Drawing.Size(103, 20)
-        Me.dat_Sum_Bis.TabIndex = 24
-        '
        'lbl
        '
        Me.lbl.AutoSize = True
@@ -181,6 +224,7 @@ Partial Class frmMDMDatenverarbetiung
        Me.Panel1.Controls.Add(Me.lblProzPruef)
        Me.Panel1.Controls.Add(Me.PictureBox1)
        Me.Panel1.Controls.Add(Me.pic)
+        Me.Panel1.Controls.Add(Me.pnlAsfinag)
        Me.Panel1.Controls.Add(Me.Panel3)
        Me.Panel1.Controls.Add(Me.Button5)
        Me.Panel1.Controls.Add(Me.Button1)
@@ -236,15 +280,15 @@ Partial Class frmMDMDatenverarbetiung
        '
        Me.Panel3.BackColor = System.Drawing.Color.White
        Me.Panel3.Controls.Add(Me.Button6)
-        Me.Panel3.Location = New System.Drawing.Point(626, 0)
+        Me.Panel3.Location = New System.Drawing.Point(626, 73)
        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(301, 114)
+        Me.Panel3.Size = New System.Drawing.Size(301, 41)
        Me.Panel3.TabIndex = 48
        '
        'Button6
        '
        Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button6.Location = New System.Drawing.Point(97, 46)
+        Me.Button6.Location = New System.Drawing.Point(102, 4)
        Me.Button6.Name = "Button6"
        Me.Button6.Size = New System.Drawing.Size(107, 23)
        Me.Button6.TabIndex = 47
@@ -514,27 +558,69 @@ Partial Class frmMDMDatenverarbetiung
        Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577)
        Me.MyDatagridview1.TabIndex = 0
        '
-        'Button7
+        'pnlAsfinag
        '
-        Me.Button7.BackColor = System.Drawing.Color.FloralWhite
-        Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button7.Location = New System.Drawing.Point(129, 3)
-        Me.Button7.Name = "Button7"
-        Me.Button7.Size = New System.Drawing.Size(120, 23)
-        Me.Button7.TabIndex = 1
-        Me.Button7.Text = "UTA"
-        Me.Button7.UseVisualStyleBackColor = False
+        Me.pnlAsfinag.Controls.Add(Me.cbxNichtabgerechnet)
+        Me.pnlAsfinag.Controls.Add(Me.Button10)
+        Me.pnlAsfinag.Controls.Add(Me.Button9)
+        Me.pnlAsfinag.Controls.Add(Me.Datum_Abrechnungsdaten)
+        Me.pnlAsfinag.Location = New System.Drawing.Point(616, 6)
+        Me.pnlAsfinag.Name = "pnlAsfinag"
+        Me.pnlAsfinag.Size = New System.Drawing.Size(311, 53)
+        Me.pnlAsfinag.TabIndex = 29
+        Me.pnlAsfinag.Visible = False
        '
-        'Panel4
+        'Datum_Abrechnungsdaten
        '
-        Me.Panel4.Controls.Add(Me.Label46)
-        Me.Panel4.Controls.Add(Me.dat_Sum_Bis)
-        Me.Panel4.Controls.Add(Me.Label45)
-        Me.Panel4.Controls.Add(Me.dat_Sum_Von)
-        Me.Panel4.Location = New System.Drawing.Point(0, 67)
-        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(583, 33)
-        Me.Panel4.TabIndex = 28
+        Me.Datum_Abrechnungsdaten.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+        Me.Datum_Abrechnungsdaten.Location = New System.Drawing.Point(193, 3)
+        Me.Datum_Abrechnungsdaten.Name = "Datum_Abrechnungsdaten"
+        Me.Datum_Abrechnungsdaten.Size = New System.Drawing.Size(103, 20)
+        Me.Datum_Abrechnungsdaten.TabIndex = 22
+        '
+        'Button9
+        '
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button9.Location = New System.Drawing.Point(10, 27)
+        Me.Button9.Name = "Button9"
+        Me.Button9.Size = New System.Drawing.Size(129, 23)
+        Me.Button9.TabIndex = 48
+        Me.Button9.Text = "Abr-datum setzen"
+        Me.Button9.UseVisualStyleBackColor = True
+        '
+        'Button10
+        '
+        Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button10.Location = New System.Drawing.Point(168, 27)
+        Me.Button10.Name = "Button10"
+        Me.Button10.Size = New System.Drawing.Size(140, 23)
+        Me.Button10.TabIndex = 49
+        Me.Button10.Text = "Abr-datum zurücksetzen"
+        Me.Button10.UseVisualStyleBackColor = True
+        '
+        'cbxNichtabgerechnet
+        '
+        Me.cbxNichtabgerechnet.AutoSize = True
+        Me.cbxNichtabgerechnet.Checked = True
+        Me.cbxNichtabgerechnet.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxNichtabgerechnet.Location = New System.Drawing.Point(10, 6)
+        Me.cbxNichtabgerechnet.Name = "cbxNichtabgerechnet"
+        Me.cbxNichtabgerechnet.Size = New System.Drawing.Size(112, 17)
+        Me.cbxNichtabgerechnet.TabIndex = 50
+        Me.cbxNichtabgerechnet.Text = "nicht abgerechnet"
+        Me.cbxNichtabgerechnet.UseVisualStyleBackColor = True
+        '
+        'cbxTestdaten
+        '
+        Me.cbxTestdaten.AutoSize = True
+        Me.cbxTestdaten.Checked = True
+        Me.cbxTestdaten.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxTestdaten.Location = New System.Drawing.Point(896, 74)
+        Me.cbxTestdaten.Name = "cbxTestdaten"
+        Me.cbxTestdaten.Size = New System.Drawing.Size(74, 17)
+        Me.cbxTestdaten.TabIndex = 51
+        Me.cbxTestdaten.Text = "Testdaten"
+        Me.cbxTestdaten.UseVisualStyleBackColor = True
        '
        'frmMDMDatenverarbetiung
        '
@@ -551,6 +637,8 @@ Partial Class frmMDMDatenverarbetiung
        Me.Text = "Datenverarbeitung"
        Me.pnl.ResumeLayout(False)
        Me.pnl.PerformLayout()
+        Me.Panel4.ResumeLayout(False)
+        Me.Panel4.PerformLayout()
        Me.FlowLayoutPanel.ResumeLayout(False)
        Me.Panel1.ResumeLayout(False)
        Me.Panel1.PerformLayout()
@@ -560,8 +648,8 @@ Partial Class frmMDMDatenverarbetiung
        Me.Panel2.ResumeLayout(False)
        Me.Panel2.PerformLayout()
        CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.Panel4.ResumeLayout(False)
-        Me.Panel4.PerformLayout()
+        Me.pnlAsfinag.ResumeLayout(False)
+        Me.pnlAsfinag.PerformLayout()
        Me.ResumeLayout(False)

    End Sub
@@ -605,4 +693,11 @@ Partial Class frmMDMDatenverarbetiung
    Friend WithEvents lblProzPruef As Label
    Friend WithEvents Button7 As Button
    Friend WithEvents Panel4 As Panel
+    Friend WithEvents Button8 As Button
+    Friend WithEvents pnlAsfinag As Panel
+    Friend WithEvents Button9 As Button
+    Friend WithEvents Datum_Abrechnungsdaten As DateTimePicker
+    Friend WithEvents Button10 As Button
+    Friend WithEvents cbxNichtabgerechnet As CheckBox
+    Friend WithEvents cbxTestdaten As CheckBox
 End Class
--- a/SDL/mdm/frmMDMDatenverarbetiung.vb
+++ b/SDL/mdm/frmMDMDatenverarbetiung.vb
@@ -27,6 +27,7 @@ Public Class frmMDMDatenverarbetiung
    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
        Select Case LIEFERANT
            Case "PLOSE" : genSummenbericht_PLOSE()
+            Case "ASFINAG" : genSummenbericht_ASFINAG()
            Case Else : MsgBox("Nicht verfügbar!")
        End Select
    End Sub
@@ -41,6 +42,7 @@ Public Class frmMDMDatenverarbetiung
        Dim pruef As Boolean = False
        Select Case LIEFERANT
            Case "PLOSE" : pruef = pruefData_PLOSE()
+            Case "ASFINAG" : pruef = pruefData_ASFINAG()
            Case Else : MsgBox("Nicht verfügbar!") : Exit Sub
        End Select

@@ -66,7 +68,11 @@ Public Class frmMDMDatenverarbetiung

        Select Case LIEFERANT
            Case "PLOSE" : initDgv_PLOSE()
+                btnDatenLaden.Text = "Daten laden"
            Case "UTA" : initDgv_UTA()
+                btnDatenLaden.Text = "Daten laden"
+            Case "ASFINAG" : initDgv_ASFINAG(Not cbxNichtabgerechnet.Checked)
+                btnDatenLaden.Text = "Mautdaten laden"
        End Select
    End Sub

@@ -85,6 +91,8 @@ Public Class frmMDMDatenverarbetiung
                    '    setFakturiertUTA()
                    'End If
                End If
+            Case "ASFINAG"
+
        End Select
    End Sub

@@ -185,12 +193,106 @@ Public Class frmMDMDatenverarbetiung
        print.Show()
    End Sub

+    Sub genSummenbericht_ASFINAG()
+        Dim displayFilter = False
+        Dim sqlstr As String = ""
+
+
+        sqlstr &= " SELECT     dbo.TTRBody.CardNumber,Adressen.AdressenNr AS KundenNr,Adressen.[Name 1], dbo.CLFArchiv.vehicleLicensePlate,dbo.TTRBody.DeliveryDate, 'ASFINAG ' + ISNULL(dbo.tblWarenarten.WarenartDE, dbo.tblWarenarten.ProductCode) as ProductCode,dbo.TTRBody.amountInclVAT - dbo.TTRBody.VATAmount as Netamount,dbo.TTRBody.VATAmount,dbo.TTRBody.amountInclVAT
+                        FROM         dbo.CLFArchiv RIGHT OUTER JOIN
+                      dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.InfoField LEFT OUTER JOIN
+                      dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
+					  INNER JOIN [VERAG].[dbo].Kreditkarten ON dbo.TTRBody.CardNumber = Kreditkarten.KartenNr
+					  INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr
+                    WHERE (dbo.TTRBody.PKHistory = 0) AND (dbo.TTRBody.PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (TTRBody.abrechnungsdatum = '" & Datum_Abrechnungsdaten.Value.ToShortDateString & "')
+                    ORDER BY dbo.TTRBody.CardNumber"
+
+
+        Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "ASFINAG")
+        'DataGridView.DataSource = dt
+
+
+        Dim print As New frmPrintLayout
+        print.Text = "ASFINAG"
+
+        Dim rpt As New rptASFINAG_TransaktionenSumary
+
+        rpt.DataSource = dt
+
+
+        'If cbxProdukt.Checked Then
+        '    rpt.GroupHeader2.DataField = "prod_descr"
+        'Else
+        '    rpt.GroupHeader2.Visible = False
+        '    rpt.GroupFooter2.Visible = False
+        'End If
+
+
+
+        Dim sum = 0
+        rpt.lblUeberschrift.Text = "ASFINAG Summenbericht " & CDate(Datum_Abrechnungsdaten.Value.ToShortDateString)
+        rpt.lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
+        'rpt.lblMandantNiederlassung.Text = PERSONAL.Mandant & "  /  " & PERSONAL.Niederlassung
+
+        'Dim cnt As Integer = 0
+        rpt.lblDat.Text = Now.ToLongDateString
+
+
+
+
+
+        Dim sumNetto As Double = 0
+        Dim sumMWST As Double = 0
+        Dim sumBrutto As Double = 0
+
+        Dim sumperKdNrNetto As Double = 0
+        Dim sumperKdNrMWST As Double = 0
+        Dim sumperKdNrBrutto As Double = 0
+
+
+        AddHandler rpt.Detail.Format, Sub()
+
+
+                                          rpt.lblKundennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("KundenNr").Value, "")
+                                          rpt.lblName1.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Name 1").Value, "")
+                                          rpt.lblKartennr.Text = SQL.isDbnullEmpty(rpt.Fields.Item("CardNumber").Value, "") & " - " & SQL.isDbnullEmpty(rpt.Fields.Item("ProductCode").Value, "")
+
+                                          rpt.lblNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netamount").Value, 2, "")
+                                          rpt.lblMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("VATAmount").Value, 2, "")
+                                          rpt.lblBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("amountInclVAT").Value, 2, "")
+
+
+                                          rpt.lblSumNet.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netamount").Value, 2, "")
+                                          rpt.lblSumVat.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("VATAmount").Value, 2, "")
+                                          rpt.lblSumBrt.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("amountInclVAT").Value, 2, "")
+
+                                          sumNetto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("Netamount").Value, 4, 0)
+                                          sumMWST += SQL.isDbnullEmptyDbl(rpt.Fields.Item("VATAmount").Value, 4, 0)
+                                          sumBrutto += SQL.isDbnullEmptyDbl(rpt.Fields.Item("amountInclVAT").Value, 4, 0)
+
+
+                                      End Sub
+
+
+        AddHandler rpt.ReportFooter1.Format, Sub()
+
+                                                 rpt.lblSumNetto.Text = sumNetto.ToString("N2")
+                                                 rpt.lblSumMwst.Text = sumMWST.ToString("N2")
+                                                 rpt.lblSumBrutto.Text = sumBrutto.ToString("N2")
+
+                                             End Sub
+
+        print.Viewer.LoadDocument(rpt)
+        print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
+        print.Show()
+    End Sub
+


    Sub initDgv_PLOSE()
        With MyDatagridview1
            .Columns.Clear()
-            .SET_SQL("  SELECT 	  plose_POLSEKundennummer,  count(*) Anzahl,plose_ProduktCode,max(plose_Produktbeschreibung) as plose_Produktbeschreibung, sum(plose_Menge) as plose_Menge,sum(plose_Preis) as plose_Preis,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_MWSTBetragWaehrungAbbuchung) as plose_MWSTBetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung) as plose_BruttobetragWaehrungAbbuchung 
+            .SET_SQL("  SELECT plose_POLSEKundennummer,  count(*) Anzahl,plose_ProduktCode,max(plose_Produktbeschreibung) as plose_Produktbeschreibung, sum(plose_Menge) as plose_Menge,sum(plose_Preis) as plose_Preis,sum(plose_NettobetragWaehrungAbbuchung) as plose_NettobetragWaehrungAbbuchung,sum(plose_MWSTBetragWaehrungAbbuchung) as plose_MWSTBetragWaehrungAbbuchung,sum(plose_BruttobetragWaehrungAbbuchung) as plose_BruttobetragWaehrungAbbuchung 
                        FROM tblPLOSE_Details
                        WHERE 1 = 1 
                            And plose_DatumTransaktion between '" & dat_Sum_Von.Value & "' and '" & dat_Sum_Bis.Value & "' 
@@ -353,6 +455,92 @@ Public Class frmMDMDatenverarbetiung

    End Sub

+    Sub initDgv_ASFINAG(abgerechnet As Boolean)
+
+        dat_Sum_Von.Value = CDate(SQL.getValueTxtBySql("SELECT Abrechnungsdatum FROM Abrechnungsdatum", "ASFINAG"))
+        Dim sqlString = "AND (TTRBody.abrechnungsdatum " & IIf(abgerechnet, "= '" & Datum_Abrechnungsdaten.Value.ToShortDateString & "')", "is null)")
+        With MyDatagridview1
+            .Columns.Clear()
+            'MsgBox(.sql)
+
+            .SET_SQL(" SELECT dbo.TTRBody.OBUID,dbo.TTRBody.CardNumber,dbo.TTRBody.receiptNumber,dbo.TTRBody.receiptNumber,dbo.TTRBody.VATAmount,dbo.TTRBody.amountInclVAT,dbo.TTRBody.abrechnungsdatum, dbo.tblWarenarten.WarenartDE, dbo.CLFArchiv.vehicleLicensePlate
+                            FROM dbo.CLFArchiv RIGHT OUTER JOIN
+                                dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.InfoField LEFT OUTER JOIN
+                                dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
+                            WHERE (dbo.TTRBody.PKHistory = 0) AND (dbo.TTRBody.PKFileName LIKE N'" & checkifTestfiles() & ".%')" & sqlString & "
+                            ORDER BY dbo.TTRBody.CardNumber, dbo.TTRBody.FileCreationDate, dbo.TTRBody.PKHistory, dbo.TTRBody.PKFileName, dbo.TTRBody.PKLine", "ASFINAG")
+            .LOAD()
+            'MsgBox(.GET_SQL())
+            If .Columns.Count > 0 Then
+
+                .Columns("WarenartDE").HeaderText = "Warenart"
+                .Columns("vehicleLicensePlate").HeaderText = "LKW-KZ"
+                .Columns("OBUID").HeaderText = "OBUID"
+                .Columns("OBUID").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+                .Columns("CardNumber").HeaderText = "Kartennummer"
+                .Columns("abrechnungsdatum").HeaderText = "Abrechnungsdatum"
+                .Columns("receiptNumber").HeaderText = "Rechnugnsnummer"
+                .Columns("VATAmount").HeaderText = "MWST"
+                .Columns("amountInclVAT").HeaderText = "Brutto"
+
+                '.Columns("VERAGLeistungsNr").ReadOnly = False
+                '.Columns("VERAGKdNr").ReadOnly = False
+
+                'For Each r As DataGridViewColumn In .Columns
+                '    If r.Name = "VERAGLeistungsNr" Or r.Name = "VERAGKdNr" Then
+                '        r.ReadOnly = False
+                '    Else
+                '        r.ReadOnly = True
+                '    End If
+                'Next
+
+
+                'Dim c As New DataGridViewTextBoxColumn
+                'c.Name = "VERAGKdNr"
+                'c.HeaderText = "VERAG KdNr"
+                'c.Width = 100
+                '.Columns.Insert(1, c)
+
+                'c = New DataGridViewTextBoxColumn
+                'c.Name = "VERAGLeistungsNr"
+                'c.HeaderText = "VERAG/PLOSE LeistungsNr."
+                'c.Width = 100
+                '.Columns.Insert(2, c)
+
+                'c = New DataGridViewTextBoxColumn
+                'c.Name = "KundeOffertenNr"
+                'c.HeaderText = "Kunde OffertenNr."
+                'c.Width = 100
+                '.Columns.Insert(3, c)
+
+                'c = New DataGridViewTextBoxColumn
+                'c.Name = "KundeLeistungsNr"
+                'c.HeaderText = "Kunde LeistungsNr."
+                'c.Width = 100
+                '.Columns.Insert(4, c)
+
+
+
+                .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
+
+            End If
+
+            Dim sumBto As Double = 0
+            Dim sumNto As Double = 0
+            For Each r As DataGridViewRow In .Rows
+                sumBto += If(IsNumeric(r.Cells("amountInclVAT").Value), CDbl(r.Cells("amountInclVAT").Value), 0)
+                sumNto += If(IsNumeric(r.Cells("amountInclVAT").Value AndAlso r.Cells("VATAmount").Value), CDbl(r.Cells("amountInclVAT").Value) - r.Cells("VATAmount").Value, 0)
+            Next
+
+            txtAnzahl.Text = .Rows.Count
+            txtPruefsummeNetto.Text = CDbl(sumNto).ToString("C2")
+            txtPruefsummeBrutto.Text = CDbl(sumBto).ToString("C2")
+            .ClearSelection()
+
+        End With
+
+    End Sub
+

    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
        initLieferant("PLOSE", sender)
@@ -374,14 +562,20 @@ Public Class frmMDMDatenverarbetiung
        Select Case Me.LIEFERANT
            Case "PLOSE"
                Panel4.Visible = True
+                pnlAsfinag.Visible = False
                Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_PLOSE(Me)
                Panel3.Controls.Add(c)
                c.Dock = DockStyle.Fill
            Case "UTA"
                Panel4.Visible = False
+                pnlAsfinag.Visible = False
                'Dim c As New usrCntlMDMDatenverarbeitungAuswertungen_UTA(Me)
                'Panel3.Controls.Add(c)
                'c.Dock = DockStyle.Fill
+            Case "ASFINAG"
+                Panel4.Visible = False
+                pnlAsfinag.Visible = True
+
        End Select

        init()
@@ -1513,6 +1707,127 @@ Public Class frmMDMDatenverarbetiung
        End Try
    End Function

+    Function pruefData_ASFINAG() As Boolean
+        pruefData_ASFINAG = True
+        Try
+
+            Dim SQLAbrechnungsparameter = ""
+            If MsgBox("Prüfung auf Inkonsistenz der Kartennummern mit Abrechnungsdatum vom " & Datum_Abrechnungsdaten.Value.ToShortDateString & " ?", vbYesNoCancel) = MsgBoxResult.Ok Then
+                SQLAbrechnungsparameter = " AND (TTRBody.abrechnungsdatum = '" & Datum_Abrechnungsdaten.Value.ToShortDateString & "') "
+            End If
+
+            Dim dtAsfinagKartenpruef As DataTable = SQL.loadDgvBySql("
+                        SELECT dbo.TTRBody.CardNumber, Kreditkarten.KartenNr, Kreditkarten.AdressenNr, (SELECT Offerten.OffertenNr FROM [VERAG].[dbo].[Offerten] WHERE (((Offerten.KundenNr)=isnull([Kreditkarten].[AdressenNr],0)) AND ((Offerten.OffertenNr)=11))) AS Offerte_11
+                            FROM dbo.CLFArchiv 
+                            RIGHT OUTER JOIN dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.InfoField 
+							LEFT OUTER JOIN dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
+                            LEFT JOIN [VERAG].[dbo].[Kreditkarten] on dbo.TTRBody.CardNumber = Kreditkarten.KartenNr
+                            WHERE (dbo.TTRBody.PKHistory = 0) AND (dbo.TTRBody.PKFileName LIKE N'" & checkifTestfiles() & ".%')" & SQLAbrechnungsparameter &
+                            "GROUP BY dbo.TTRBody.CardNumber, Kreditkarten.KartenNr, Kreditkarten.AdressenNr
+                            HAVING dbo.TTRBody.CardNumber is null or (dbo.TTRBody.CardNumber is not null  AND ((Kreditkarten.AdressenNr) Is Not Null) AND (((SELECT Offerten.OffertenNr FROM  [VERAG].[dbo].[Offerten] WHERE (((Offerten.KundenNr)=isnull([Kreditkarten].[AdressenNr],0)) AND ((Offerten.OffertenNr)=11)))) Is Null))
+                            ORDER BY dbo.TTRBody.CardNumber", "ASFINAG")
+
+
+            Dim VERAGKdNr = -1
+            Dim VERAGLeistungsNr = -1
+            Dim found = False
+            Dim results As DataRow()
+
+            Dim cnt = 0
+
+            For Each r As DataGridViewRow In MyDatagridview1.Rows
+                'KUNDEN-NR / PLOSE KD-NR
+                'results = dtAsfinagKartenpruef.Select("PLOSEKundenNr = '" & r.Cells("plose_POLSEKundennummer").Value & "'")
+                'If results.Length > 0 Then
+                '    'Gefunden!
+                '    'r.Cells("VERAGKdNr").Value = results(0)("PLOSEKundenNr")
+                '    'r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream
+                '    VERAGKdNr = results(0)("AdressenNr")
+                '    found = True
+                'Else
+                '    r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip
+                '    pruefData_ASFINAG = False
+                'End If
+
+                'KUNDEN-NR / PLOSE KD-NR
+                'Default -> Nicht gefunden 
+                'r.Cells("VERAGKdNr").Style.BackColor = Color.PapayaWhip
+                'found = False
+                'For Each k In VERAGKdNr_DT.Rows
+                '    If r.Cells("plose_POLSEKundennummer").Value = k("PLOSEKundenNr") Then
+                '        'Gefunden!
+                '        r.Cells("VERAGKdNr").Value = k("PLOSEKundenNr")
+                '        r.Cells("VERAGKdNr").Style.BackColor = Color.MintCream
+                '        VERAGKdNr = k("AdressenNr")
+                '        found = True
+                '        Exit For
+                '    End If
+                'Next
+                'If Not found Then pruefData_PLOSE = False
+
+                'VERAG/PLOSE LEISTUNG
+                'results = VERAGLeistungsNr_DT.Select("plp_ProductCode = '" & r.Cells("plose_ProduktCode").Value & "' AND plp_LeistungsNr is not null")
+                'If results.Length > 0 Then
+                '    'Gefunden!
+                '    VERAGLeistungsNr = results(0)("plp_LeistungsNr")
+                '    r.Cells("VERAGLeistungsNr").Value = results(0)("plp_LeistungsNr")
+                '    r.Cells("VERAGLeistungsNr").Style.BackColor = Color.MintCream
+                '    found = True
+                'Else
+                '    r.Cells("VERAGLeistungsNr").Style.BackColor = Color.PapayaWhip
+                '    pruefData_ASFINAG = False
+                'End If
+
+
+                ''VERAG OFFERT 80
+                ''Default -> Nicht gefunden
+                'Dim OffertenNr_DT = SQL.loadDgvBySql("SELECT KundenNr,OffertenNr FROM [Offerten] where  OffertenNr = 80  AND KundenNr = '" & VERAGKdNr & "'", "FMZOLL")
+                'results = OffertenNr_DT.Select("KundenNr = '" & VERAGKdNr & "'")
+                'If results.Length > 0 Then
+                '    'Gefunden!
+                '    r.Cells("KundeOffertenNr").Value = results(0)("OffertenNr")
+                '    r.Cells("KundeOffertenNr").Style.BackColor = Color.MintCream
+                'Else
+                '    pruefData_ASFINAG = False
+                '    r.Cells("KundeOffertenNr").Style.BackColor = Color.PapayaWhip
+                'End If
+
+
+
+                ''VERAG LEISTUNGS-NR
+                ''Default -> Nicht gefunden 
+                'Dim KundeLeistungsNr_DT = SQL.loadDgvBySql("SELECT [LeistungsNr],KundenNr FROM [Offertenpositionen] where  OffertenNr = 80 AND KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'", "FMZOLL")
+                'results = KundeLeistungsNr_DT.Select("KundenNr = '" & VERAGKdNr & "' AND LeistungsNr = '" & VERAGLeistungsNr & "'")
+                'If results.Length > 0 Then
+                '    'Gefunden!
+                '    r.Cells("KundeLeistungsNr").Value = VERAGLeistungsNr
+                '    r.Cells("KundeLeistungsNr").Style.BackColor = Color.MintCream
+                'Else
+                '    r.Cells("KundeLeistungsNr").Style.BackColor = Color.PapayaWhip
+                '    pruefData_ASFINAG = False
+                'End If
+
+
+                'If cnt Mod 5 = 0 Then
+                '    lblProzPruef.Text = CInt(cnt / MyDatagridview1.Rows.Count() * 100) & " %"
+                '    lblProzPruef.Refresh()
+                '    Me.Refresh()
+                'End If
+
+                cnt += 1
+
+            Next
+
+            MyDatagridview1.ClearSelection()
+            MyDatagridview1.DataSource = dtAsfinagKartenpruef
+            Dim count = MyDatagridview1.Rows.Count()
+            If count > 0 Then lblProzPruef.Text = CInt(cnt / count * 100) & " %" '100
+        Catch ex As Exception
+            MsgBox(ex.Message & ex.StackTrace)
+            pruefData_ASFINAG = False
+        End Try
+    End Function
+
    Function pruefData_PLOSE_old() As Boolean
        pruefData_PLOSE_old = True
        Try
@@ -1686,7 +2001,58 @@ Public Class frmMDMDatenverarbetiung
    End Sub

    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
-
        initLieferant("UTA", sender)
    End Sub
+
+    Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click
+        initLieferant("ASFINAG", sender)
+    End Sub
+
+    Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click
+        If CDate(Datum_Abrechnungsdaten.Value) <= Today.AddDays(1) Then
+            If MsgBox("Möchten Sie das Abrechnungsdatum auf " & Datum_Abrechnungsdaten.Value.ToShortDateString & " setzen?", vbYesNoCancel) = MsgBoxResult.Yes Then
+
+                'SQL.doSQL("DELETE * from tblAsfinagMaut", "FMZOLL")
+
+                SQL.doSQL("Update Abrechnungsdatum SET Abrechnungsdatum = '" & Datum_Abrechnungsdaten.Value.ToShortDateString & "'", "ASFINAG")
+                If SQL.doSQL("UPDATE dbo.TTRBody SET Abrechnungsdatum = '" & Datum_Abrechnungsdaten.Value.ToShortDateString & "' WHERE (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (FileCreationDate <= '" & Datum_Abrechnungsdaten.Value.ToShortDateString & "') AND (abrechnungsdatum IS NULL)", "ASFINAG") Then MsgBox("Abrechnungsdatum gesetzt!")
+
+                Dim dt As DataTable = SQL.loadDgvBySql("SELECT *  FROM tblAsfinagMaut", "FMZOLL")
+
+                initDgv_ASFINAG(Not cbxNichtabgerechnet.Checked)
+            End If
+        Else
+            MsgBox("Datum muss kleiner/gleich Tagesdatum sein")
+        End If
+    End Sub
+
+    Private Sub Button10_Click(sender As Object, e As EventArgs) Handles Button10.Click
+        If CDate(Datum_Abrechnungsdaten.Value) <= Today.AddDays(1) Then
+            If MsgBox("Möchten Sie das Abrechnungsdatum vom " & Datum_Abrechnungsdaten.Value.ToShortDateString & "zurücksetzen?", vbYesNoCancel) = MsgBoxResult.Ok Then
+                If SQL.doSQL("UPDATE dbo.TTRBody SET Abrechnungsdatum = 'NULL' WHERE Abrechnungsdatum = '" & Datum_Abrechnungsdaten.Value.ToShortDateString & "' AND (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%')", "ASFINAG") Then MsgBox("Abrechnungsdatum zurückgesetzt!")
+            End If
+        Else
+            MsgBox("Datum muss kleiner/gleich Tagesdatum sein")
+        End If
+    End Sub
+
+    Private Sub Datum_Abrechnungsdaten_ValueChanged(sender As Object, e As EventArgs) Handles Datum_Abrechnungsdaten.ValueChanged
+        If Datum_Abrechnungsdaten IsNot Nothing Then
+            cbxNichtabgerechnet.Checked = False
+        End If
+    End Sub
+
+    Private Function checkifTestfiles() As String
+
+        If cbxTestdaten.Checked Then
+
+            Return "TEPVGTTR"
+        Else
+            Return "LEPVGTTR"
+
+        End If
+
+    End Function
+
+
 End Class
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
@@ -148,6 +148,13 @@ Public Class cRechnungsausgang
        Return cnt > 0
    End Function

+    Public Function checkRechnungsNrIsSet() As Boolean
+        'Prüfugn ob Eintrag mit dieser Rechnungsnr in DB existiert
+        If Me.RechnungsNr <= 0 Then Return False
+        Dim cnt = SQL.getValueTxtBySql("SELECT COUNT(*) FROM [Rechnungsausgang] WHERE RechnungsNr='" & Me.RechnungsNr & "' and DruckDatumZeit is not null and Buchungsjahr = " & Me.Buchungsjahr & " and Firma_ID = '" & Me.Firma_ID & "'", "FMZOLL")
+        Return cnt > 0
+    End Function
+
    Public Shared Function getMaxRGUnterNr(FilialenNr As Integer, AbfertigungsNr As Integer, SpeditionsbuchUnterNr As Integer) As Integer
        ' Dim Nr = SQL.getValueTxtBySql("Select isnull([UnterNr], -1) + 1  FROM [Rechnungsausgang]  where [FilialenNr]='" & FilialenNr & "' And AbfertigungsNr='" & AbfertigungsNr & "' And SpeditionsbuchUnterNr='" & SpeditionsbuchUnterNr & "'  ORDER BY [UnterNr] desc", "FMZOLL")
        Dim Nr = SQL.getValueTxtBySql("Select TOP 1 isnull([UnterNr], -1) + 1  FROM [Rechnungsausgang]  where [FilialenNr]='" & FilialenNr & "' And AbfertigungsNr='" & AbfertigungsNr & "'   ORDER BY [UnterNr] desc", "FMZOLL")
@@ -485,7 +492,7 @@ Public Class cRechnungsausgang
        End If

        Return True
-        End Function
+    End Function

    Public Function SAVE_POSITIONEN(RK_ID) As Boolean
        If DELETE_POSITIONEN() Then ' zuerst Einträge löschen...
--- a/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb
@@ -87,7 +87,8 @@ Public Class cSDL
        Me.KundenNr = KundenNr
        Me.KfzKennzeichen = KfzKennzeichen
        Me.SDLNr = SDLNr
-        Me.History = SQL.getValueTxtBySql("SELECT TOP 1 History FROM SDL WHERE KundenNr='" & KundenNr & "' AND KfzKennzeichen='" & KfzKennzeichen & "' AND SDLNr='" & SDLNr & "' ORDER BY History DESC", "SDL")
+        Dim histroyTemp = SQL.getValueTxtBySql("SELECT TOP 1 History FROM SDL WHERE KundenNr='" & KundenNr & "' AND KfzKennzeichen='" & KfzKennzeichen & "' AND SDLNr='" & SDLNr & "' ORDER BY History DESC", "SDL")
+        Me.History = IIf(histroyTemp <> "", histroyTemp, 0)
        LOAD()
    End Sub

--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
@@ -1354,9 +1354,10 @@ Public Class cFormularManager

                doc.PageSettings.Orientation = Spire.Pdf.PdfPageOrientation.Landscape
                doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.FitSize, True)
+
                ' doc.PrinterName = printerName
                ' doc.PrintDocument.Print()
-
+                doc.SaveToFile(targetPath)
            End If


--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
@@ -858,7 +858,7 @@ Public Class cATEZ_NCTS_IN
                'Dim json1 As New Chilkat.JsonObject
                success = bd.LoadFile(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
                success = jsonData.UpdateString("Attachments.Attachment[" & i & "].FileType", r.Cells("anh_Typ").Value)
-                success = jsonData.UpdateString("Attachments.Attachment[" & i & "].DocumentType", r.Cells("anh_Art").Value)
+                success = jsonData.UpdateString("Attachments.Attachment[" & i & "].DocumentType", IIf(r.Cells("anh_Art").Value IsNot DBNull.Value, r.Cells("anh_Art").Value, "OTHER"))
                success = jsonData.UpdateString("Attachments.Attachment[" & i & "].base64BinaryStream", bd.GetEncoded("base64"))
                i = i + 1
            End If
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
@@ -534,7 +534,7 @@ Public Class cTimasAPI

                If (rest.ResponseStatusCode <> 201) Then
                    Debug.WriteLine(rest.ResponseHeader)
-                    MsgBox(rest.ResponseStatusCode & " " & rest.ResponseStatusText)
+                    MsgBox(rest.ResponseStatusCode & " " & rest.ResponseStatusText & vbNewLine & sbResponseBody.ToString)
                    Return Nothing
                End If