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

SDL/Formulare/KDFormulare/frmFormulare.vb

@@ -4416,27 +4416,29 @@ Public Class FormularManagerNEU
 
                     'listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtFirma.Text, 25, 103, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
                     'Splittung von Vor und Nachname
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(0, usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim, 25, 96, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                    If usrCntl.txtHerrFrau.Text <> "" Then
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(usrCntl.txtHerrFrau.Text.IndexOf(" "), usrCntl.txtHerrFrau.TextLength - usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim(), 25, 113, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(0, usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim, 25, 96, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtHerrFrau.Text.Substring(usrCntl.txtHerrFrau.Text.IndexOf(" "), usrCntl.txtHerrFrau.TextLength - usrCntl.txtHerrFrau.Text.IndexOf(" ")).Trim(), 25, 113, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                    End If
 
 
                     listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtOrt.Text, 25, 158, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 25, 166, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtAdresse1.Text, 25, 166, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.MyTextBox2.Text, 25, 177, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.MyTextBox2.Text, 25, 177, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLand.Text, 25, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtLand.Text, 25, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPLZ.Text, 45, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtPLZ.Text, 45, 147, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
 
 
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 25, 226, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtTel.Text, 25, 226, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 25, 210, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtEmail.Text, 25, 210, 150, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT))
 
-                    listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 25, 184, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT, 2))
+                        listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(usrCntl.txtUid.Text, 25, 184, 70, 6, "bold", 10, , itextsharp.text.Element.ALIGN_LEFT, 2))
 
 
 
-                Else
+                    Else
 
-                    If usrCntl.DateTimePicker1 IsNot Nothing AndAlso IsDate((usrCntl.DateTimePicker1.Value)) Then
+                        If usrCntl.DateTimePicker1 IsNot Nothing AndAlso IsDate((usrCntl.DateTimePicker1.Value)) Then
                     listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Day, 135, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
                     listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Month, 145, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))
                     listTowrite.Add(New VERAG_PROG_ALLGEMEIN.cPDFWriteValues(CDate(usrCntl.DateTimePicker1.Value).Year, 157, 82, 150, 6, "bold", 14, , itextsharp.text.Element.ALIGN_LEFT))

SDL/SDL.vbproj

@@ -715,6 +715,12 @@
     <Compile Include="kunden\usrcntlVertraege.vb">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Include="mdm\ASFINAG\rptASFINAG_Anhang.Designer.vb">
+      <DependentUpon>rptASFINAG_Anhang.vb</DependentUpon>
+    </Compile>
+    <Compile Include="mdm\ASFINAG\rptASFINAG_Anhang.vb">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="mdm\Besuchsberichte\frmBesuchsberichte.Designer.vb">
       <DependentUpon>frmBesuchsberichte.vb</DependentUpon>
     </Compile>
@@ -3132,6 +3138,9 @@
     <EmbeddedResource Include="kunden\usrcntlVertraege.resx">
       <DependentUpon>usrcntlVertraege.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="mdm\ASFINAG\rptASFINAG_Anhang.resx">
+      <DependentUpon>rptASFINAG_Anhang.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="mdm\Besuchsberichte\frmBesuchsberichte.resx">
       <DependentUpon>frmBesuchsberichte.vb</DependentUpon>
     </EmbeddedResource>

SDL/UsrCntlEssensbestellungen.vb

@@ -585,8 +585,10 @@ Public Class UsrCntlessensbestellungen
     Private Sub initCBOFields()
 
 
+        cbxMitarbeiter.DropDownWidth = 200
+
         cbxMenu.fillWithSQL("SELECT Distinct Top 50 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE() 
-        cbxMitarbeiter.fillWithSQL("SELECT  [mit_id], ([mit_vname] + ' ' + [mit_nname]) as name FROM [tblMitarbeiter] where [mit_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND mit_niederlassung = 'SUB' AND ((CAse when mit_firma = 'ALL' Then mit_FirmaHaupt else mit_firma END ) = 'VERAG'  Or mit_firma = 'UNISPED' OR mit_firma = 'IMEX' OR mit_firma = 'FRONTOFFICE') Or mit_id = 144 order by name ", False, "ADMIN", True)
+        cbxMitarbeiter.fillWithSQL("SELECT  [mit_id], ([mit_vname] + ' ' + [mit_nname]) + ' (' + mit_firma +')' as name FROM [tblMitarbeiter] where [mit_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND mit_niederlassung = 'SUB' AND ((CAse when mit_firma = 'ALL' Then mit_FirmaHaupt else mit_firma END ) = 'VERAG'  Or mit_firma = 'UNISPED' OR mit_firma = 'IMEX' OR mit_firma = 'FRONTOFFICE') Or mit_id = 144 order by name ", False, "ADMIN", True)
         cbxAbteilung.fillWithSQL("SELECT [abt_kuerzel], [abt_bezeichnung] from [tblAbteilungen] ", False, "ADMIN", True,, "")
 
         cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))

SDL/frmMain.vb

@@ -143,7 +143,7 @@ Public Class frmMain
             Dim timas As New cTimasAPI
             Dim infoMessage As String = ""
             Dim timeEntryExisting As Boolean = False
-            Dim isEndpointRunning As Boolean
+            Dim isEndpointRunning As Boolean = True
             timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, Nothing, timeEntryExisting,, isEndpointRunning)
             If Not timeEntryExisting AndAlso isEndpointRunning Then
                 Dim a As MsgBoxResult = MsgBox("Für " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " wurde heute noch keine Zeit erfasst!" & vbNewLine & Now.ToString() & " als Startzeit erfassen?", vbYesNo)

SDL/mdm/ASFINAG/rptASFINAG_Anhang.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>

SDL/mdm/ASFINAG/rptASFINAG_Anhang.vb

@@ -0,0 +1,7 @@
+Imports GrapeCity.ActiveReports 
+Imports GrapeCity.ActiveReports.Document
+
+Public Class rptASFINAG_Anhang
+
+
+End Class

SDL/mdm/frmMDMDatenverarbetiung.Designer.vb

@@ -25,7 +25,8 @@ 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.cbxASFINAGNichtAbgerechnet = New System.Windows.Forms.CheckBox()
+        Me.cbxBelegeerstellt = New System.Windows.Forms.CheckBox()
+        Me.cbxASFINAGAbgerechnet = New System.Windows.Forms.CheckBox()
         Me.cbxTestdaten = New System.Windows.Forms.CheckBox()
         Me.Panel4 = New System.Windows.Forms.Panel()
         Me.Label46 = New System.Windows.Forms.Label()
@@ -52,23 +53,23 @@ Partial Class frmMDMDatenverarbetiung
         Me.Button1 = New System.Windows.Forms.Button()
         Me.btnKunde = New System.Windows.Forms.Button()
         Me.Label4 = New System.Windows.Forms.Label()
-        Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.cbx = New System.Windows.Forms.CheckBox()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.Label43 = New System.Windows.Forms.Label()
         Me.datPloseAnhang = New System.Windows.Forms.DateTimePicker()
-        Me.Button4 = New System.Windows.Forms.Button()
+        Me.btnREerstellen = New System.Windows.Forms.Button()
         Me.Label44 = New System.Windows.Forms.Label()
         Me.txtPloseAnh_Einarbeitung = New System.Windows.Forms.TextBox()
         Me.pbPloseAnh_Proz = New System.Windows.Forms.ProgressBar()
         Me.lblPloseAnh_Proz = New System.Windows.Forms.Label()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label2 = New System.Windows.Forms.Label()
-        Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Button3 = New System.Windows.Forms.Button()
         Me.Button2 = New System.Windows.Forms.Button()
         Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.txtPruefsummeBrutto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtPruefsummeNetto = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.pnl.SuspendLayout()
         Me.Panel4.SuspendLayout()
         Me.FlowLayoutPanel.SuspendLayout()
@@ -83,7 +84,8 @@ Partial Class frmMDMDatenverarbetiung
         '
         'pnl
         '
-        Me.pnl.Controls.Add(Me.cbxASFINAGNichtAbgerechnet)
+        Me.pnl.Controls.Add(Me.cbxBelegeerstellt)
+        Me.pnl.Controls.Add(Me.cbxASFINAGAbgerechnet)
         Me.pnl.Controls.Add(Me.cbxTestdaten)
         Me.pnl.Controls.Add(Me.Panel4)
         Me.pnl.Controls.Add(Me.FlowLayoutPanel)
@@ -97,29 +99,42 @@ Partial Class frmMDMDatenverarbetiung
         Me.pnl.Size = New System.Drawing.Size(1163, 100)
         Me.pnl.TabIndex = 1
         '
-        'cbxASFINAGNichtAbgerechnet
+        'cbxBelegeerstellt
         '
-        Me.cbxASFINAGNichtAbgerechnet.AutoSize = True
+        Me.cbxBelegeerstellt.AutoSize = True
-        Me.cbxASFINAGNichtAbgerechnet.Checked = True
+        Me.cbxBelegeerstellt.Checked = True
-        Me.cbxASFINAGNichtAbgerechnet.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxBelegeerstellt.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.cbxASFINAGNichtAbgerechnet.Location = New System.Drawing.Point(784, 75)
+        Me.cbxBelegeerstellt.Location = New System.Drawing.Point(654, 75)
-        Me.cbxASFINAGNichtAbgerechnet.Name = "cbxASFINAGNichtAbgerechnet"
+        Me.cbxBelegeerstellt.Name = "cbxBelegeerstellt"
-        Me.cbxASFINAGNichtAbgerechnet.Size = New System.Drawing.Size(112, 17)
+        Me.cbxBelegeerstellt.Size = New System.Drawing.Size(86, 17)
-        Me.cbxASFINAGNichtAbgerechnet.TabIndex = 52
+        Me.cbxBelegeerstellt.TabIndex = 53
-        Me.cbxASFINAGNichtAbgerechnet.Text = "nicht abgerechnet"
+        Me.cbxBelegeerstellt.Text = "Belge erstellt"
-        Me.cbxASFINAGNichtAbgerechnet.UseVisualStyleBackColor = True
+        Me.cbxBelegeerstellt.UseVisualStyleBackColor = True
+        Me.cbxBelegeerstellt.Visible = False
+        '
+        'cbxASFINAGAbgerechnet
+        '
+        Me.cbxASFINAGAbgerechnet.AutoSize = True
+        Me.cbxASFINAGAbgerechnet.Checked = True
+        Me.cbxASFINAGAbgerechnet.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.cbxASFINAGAbgerechnet.Location = New System.Drawing.Point(746, 75)
+        Me.cbxASFINAGAbgerechnet.Name = "cbxASFINAGAbgerechnet"
+        Me.cbxASFINAGAbgerechnet.Size = New System.Drawing.Size(144, 17)
+        Me.cbxASFINAGAbgerechnet.TabIndex = 52
+        Me.cbxASFINAGAbgerechnet.Text = "Abrechnungsdat. gesetzt"
+        Me.cbxASFINAGAbgerechnet.UseVisualStyleBackColor = True
+        Me.cbxASFINAGAbgerechnet.Visible = False
         '
         'cbxTestdaten
         '
         Me.cbxTestdaten.AutoSize = True
-        Me.cbxTestdaten.Checked = True
-        Me.cbxTestdaten.CheckState = System.Windows.Forms.CheckState.Checked
         Me.cbxTestdaten.Location = New System.Drawing.Point(905, 75)
         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
+        Me.cbxTestdaten.Visible = False
         '
         'Panel4
         '
@@ -129,7 +144,7 @@ Partial Class frmMDMDatenverarbetiung
         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.Size = New System.Drawing.Size(417, 33)
         Me.Panel4.TabIndex = 28
         '
         'Label46
@@ -394,31 +409,6 @@ Partial Class frmMDMDatenverarbetiung
         Me.Label4.TabIndex = 44
         Me.Label4.Text = "Prüfsumme brutto:"
         '
-        'txtPruefsummeBrutto
-        '
-        Me.txtPruefsummeBrutto._DateTimeOnly = False
-        Me.txtPruefsummeBrutto._numbersOnly = False
-        Me.txtPruefsummeBrutto._numbersOnlyKommastellen = ""
-        Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True
-        Me.txtPruefsummeBrutto._Prozent = False
-        Me.txtPruefsummeBrutto._ShortDateNew = False
-        Me.txtPruefsummeBrutto._ShortDateOnly = False
-        Me.txtPruefsummeBrutto._TimeOnly = False
-        Me.txtPruefsummeBrutto._TimeOnly_Seconds = False
-        Me.txtPruefsummeBrutto._value = ""
-        Me.txtPruefsummeBrutto._Waehrung = False
-        Me.txtPruefsummeBrutto._WaehrungZeichen = True
-        Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black
-        Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69)
-        Me.txtPruefsummeBrutto.MaxLineLength = -1
-        Me.txtPruefsummeBrutto.MaxLines_Warning = ""
-        Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing
-        Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto"
-        Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20)
-        Me.txtPruefsummeBrutto.TabIndex = 43
-        Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
         'cbx
         '
         Me.cbx.AutoSize = True
@@ -433,7 +423,7 @@ Partial Class frmMDMDatenverarbetiung
         '
         Me.Panel2.Controls.Add(Me.Label43)
         Me.Panel2.Controls.Add(Me.datPloseAnhang)
-        Me.Panel2.Controls.Add(Me.Button4)
+        Me.Panel2.Controls.Add(Me.btnREerstellen)
         Me.Panel2.Controls.Add(Me.Label44)
         Me.Panel2.Controls.Add(Me.txtPloseAnh_Einarbeitung)
         Me.Panel2.Controls.Add(Me.pbPloseAnh_Proz)
@@ -461,15 +451,15 @@ Partial Class frmMDMDatenverarbetiung
         Me.datPloseAnhang.Size = New System.Drawing.Size(103, 20)
         Me.datPloseAnhang.TabIndex = 39
         '
-        'Button4
+        'btnREerstellen
         '
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnREerstellen.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button4.Location = New System.Drawing.Point(6, 40)
+        Me.btnREerstellen.Location = New System.Drawing.Point(6, 40)
-        Me.Button4.Name = "Button4"
+        Me.btnREerstellen.Name = "btnREerstellen"
-        Me.Button4.Size = New System.Drawing.Size(283, 23)
+        Me.btnREerstellen.Size = New System.Drawing.Size(283, 23)
-        Me.Button4.TabIndex = 30
+        Me.btnREerstellen.TabIndex = 30
-        Me.Button4.Text = "Rechnungen / Anhänge erstellen"
+        Me.btnREerstellen.Text = "Rechnungen / Anhänge erstellen"
-        Me.Button4.UseVisualStyleBackColor = True
+        Me.btnREerstellen.UseVisualStyleBackColor = True
         '
         'Label44
         '
@@ -515,31 +505,6 @@ Partial Class frmMDMDatenverarbetiung
         Me.Label3.TabIndex = 38
         Me.Label3.Text = "Prüfsumme netto:"
         '
-        'txtPruefsummeNetto
-        '
-        Me.txtPruefsummeNetto._DateTimeOnly = False
-        Me.txtPruefsummeNetto._numbersOnly = False
-        Me.txtPruefsummeNetto._numbersOnlyKommastellen = ""
-        Me.txtPruefsummeNetto._numbersOnlyTrennzeichen = True
-        Me.txtPruefsummeNetto._Prozent = False
-        Me.txtPruefsummeNetto._ShortDateNew = False
-        Me.txtPruefsummeNetto._ShortDateOnly = False
-        Me.txtPruefsummeNetto._TimeOnly = False
-        Me.txtPruefsummeNetto._TimeOnly_Seconds = False
-        Me.txtPruefsummeNetto._value = ""
-        Me.txtPruefsummeNetto._Waehrung = False
-        Me.txtPruefsummeNetto._WaehrungZeichen = True
-        Me.txtPruefsummeNetto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtPruefsummeNetto.ForeColor = System.Drawing.Color.Black
-        Me.txtPruefsummeNetto.Location = New System.Drawing.Point(1051, 43)
-        Me.txtPruefsummeNetto.MaxLineLength = -1
-        Me.txtPruefsummeNetto.MaxLines_Warning = ""
-        Me.txtPruefsummeNetto.MaxLines_Warning_Label = Nothing
-        Me.txtPruefsummeNetto.Name = "txtPruefsummeNetto"
-        Me.txtPruefsummeNetto.Size = New System.Drawing.Size(100, 20)
-        Me.txtPruefsummeNetto.TabIndex = 37
-        Me.txtPruefsummeNetto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
         'Label2
         '
         Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -550,31 +515,6 @@ Partial Class frmMDMDatenverarbetiung
         Me.Label2.TabIndex = 36
         Me.Label2.Text = "Anzahl:"
         '
-        'txtAnzahl
-        '
-        Me.txtAnzahl._DateTimeOnly = False
-        Me.txtAnzahl._numbersOnly = False
-        Me.txtAnzahl._numbersOnlyKommastellen = ""
-        Me.txtAnzahl._numbersOnlyTrennzeichen = True
-        Me.txtAnzahl._Prozent = False
-        Me.txtAnzahl._ShortDateNew = False
-        Me.txtAnzahl._ShortDateOnly = False
-        Me.txtAnzahl._TimeOnly = False
-        Me.txtAnzahl._TimeOnly_Seconds = False
-        Me.txtAnzahl._value = ""
-        Me.txtAnzahl._Waehrung = False
-        Me.txtAnzahl._WaehrungZeichen = True
-        Me.txtAnzahl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtAnzahl.ForeColor = System.Drawing.Color.Black
-        Me.txtAnzahl.Location = New System.Drawing.Point(1051, 16)
-        Me.txtAnzahl.MaxLineLength = -1
-        Me.txtAnzahl.MaxLines_Warning = ""
-        Me.txtAnzahl.MaxLines_Warning_Label = Nothing
-        Me.txtAnzahl.Name = "txtAnzahl"
-        Me.txtAnzahl.Size = New System.Drawing.Size(100, 20)
-        Me.txtAnzahl.TabIndex = 35
-        Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
         'Button3
         '
         Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -612,6 +552,81 @@ Partial Class frmMDMDatenverarbetiung
         Me.MyDatagridview1.Size = New System.Drawing.Size(1163, 577)
         Me.MyDatagridview1.TabIndex = 0
         '
+        'txtPruefsummeBrutto
+        '
+        Me.txtPruefsummeBrutto._DateTimeOnly = False
+        Me.txtPruefsummeBrutto._numbersOnly = False
+        Me.txtPruefsummeBrutto._numbersOnlyKommastellen = ""
+        Me.txtPruefsummeBrutto._numbersOnlyTrennzeichen = True
+        Me.txtPruefsummeBrutto._Prozent = False
+        Me.txtPruefsummeBrutto._ShortDateNew = False
+        Me.txtPruefsummeBrutto._ShortDateOnly = False
+        Me.txtPruefsummeBrutto._TimeOnly = False
+        Me.txtPruefsummeBrutto._TimeOnly_Seconds = False
+        Me.txtPruefsummeBrutto._value = ""
+        Me.txtPruefsummeBrutto._Waehrung = False
+        Me.txtPruefsummeBrutto._WaehrungZeichen = True
+        Me.txtPruefsummeBrutto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtPruefsummeBrutto.ForeColor = System.Drawing.Color.Black
+        Me.txtPruefsummeBrutto.Location = New System.Drawing.Point(1051, 69)
+        Me.txtPruefsummeBrutto.MaxLineLength = -1
+        Me.txtPruefsummeBrutto.MaxLines_Warning = ""
+        Me.txtPruefsummeBrutto.MaxLines_Warning_Label = Nothing
+        Me.txtPruefsummeBrutto.Name = "txtPruefsummeBrutto"
+        Me.txtPruefsummeBrutto.Size = New System.Drawing.Size(100, 20)
+        Me.txtPruefsummeBrutto.TabIndex = 43
+        Me.txtPruefsummeBrutto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'txtPruefsummeNetto
+        '
+        Me.txtPruefsummeNetto._DateTimeOnly = False
+        Me.txtPruefsummeNetto._numbersOnly = False
+        Me.txtPruefsummeNetto._numbersOnlyKommastellen = ""
+        Me.txtPruefsummeNetto._numbersOnlyTrennzeichen = True
+        Me.txtPruefsummeNetto._Prozent = False
+        Me.txtPruefsummeNetto._ShortDateNew = False
+        Me.txtPruefsummeNetto._ShortDateOnly = False
+        Me.txtPruefsummeNetto._TimeOnly = False
+        Me.txtPruefsummeNetto._TimeOnly_Seconds = False
+        Me.txtPruefsummeNetto._value = ""
+        Me.txtPruefsummeNetto._Waehrung = False
+        Me.txtPruefsummeNetto._WaehrungZeichen = True
+        Me.txtPruefsummeNetto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtPruefsummeNetto.ForeColor = System.Drawing.Color.Black
+        Me.txtPruefsummeNetto.Location = New System.Drawing.Point(1051, 43)
+        Me.txtPruefsummeNetto.MaxLineLength = -1
+        Me.txtPruefsummeNetto.MaxLines_Warning = ""
+        Me.txtPruefsummeNetto.MaxLines_Warning_Label = Nothing
+        Me.txtPruefsummeNetto.Name = "txtPruefsummeNetto"
+        Me.txtPruefsummeNetto.Size = New System.Drawing.Size(100, 20)
+        Me.txtPruefsummeNetto.TabIndex = 37
+        Me.txtPruefsummeNetto.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'txtAnzahl
+        '
+        Me.txtAnzahl._DateTimeOnly = False
+        Me.txtAnzahl._numbersOnly = False
+        Me.txtAnzahl._numbersOnlyKommastellen = ""
+        Me.txtAnzahl._numbersOnlyTrennzeichen = True
+        Me.txtAnzahl._Prozent = False
+        Me.txtAnzahl._ShortDateNew = False
+        Me.txtAnzahl._ShortDateOnly = False
+        Me.txtAnzahl._TimeOnly = False
+        Me.txtAnzahl._TimeOnly_Seconds = False
+        Me.txtAnzahl._value = ""
+        Me.txtAnzahl._Waehrung = False
+        Me.txtAnzahl._WaehrungZeichen = True
+        Me.txtAnzahl.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtAnzahl.ForeColor = System.Drawing.Color.Black
+        Me.txtAnzahl.Location = New System.Drawing.Point(1051, 16)
+        Me.txtAnzahl.MaxLineLength = -1
+        Me.txtAnzahl.MaxLines_Warning = ""
+        Me.txtAnzahl.MaxLines_Warning_Label = Nothing
+        Me.txtAnzahl.Name = "txtAnzahl"
+        Me.txtAnzahl.Size = New System.Drawing.Size(100, 20)
+        Me.txtAnzahl.TabIndex = 35
+        Me.txtAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
         'frmMDMDatenverarbetiung
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -655,7 +670,7 @@ Partial Class frmMDMDatenverarbetiung
     Friend WithEvents FlowLayoutPanel As FlowLayoutPanel
     Friend WithEvents btn As Button
     Friend WithEvents btnDatenLaden As Button
-    Friend WithEvents Button4 As Button
+    Friend WithEvents btnREerstellen As Button
     Friend WithEvents Button3 As Button
     Friend WithEvents Button2 As Button
     Friend WithEvents txtAnzahl As VERAG_PROG_ALLGEMEIN.MyTextBox
@@ -687,5 +702,6 @@ Partial Class frmMDMDatenverarbetiung
     Friend WithEvents bntDatumsetzen As Button
     Friend WithEvents bntDatumzuruecksetzen As Button
     Friend WithEvents cbxTestdaten As CheckBox
-    Friend WithEvents cbxASFINAGNichtAbgerechnet As CheckBox
+    Friend WithEvents cbxASFINAGAbgerechnet As CheckBox
+    Friend WithEvents cbxBelegeerstellt As CheckBox
 End Class

SDL/mdm/frmMDMDatenverarbetiung.vb

@@ -1,6 +1,7 @@
 Imports System.Data.OleDb
 Imports System.IO
 Imports com.sun.jdi
+Imports com.sun.net.httpserver.Authenticator
 Imports DAKOSY_Worker.NichtAbschliessendeFestsetzung
 Imports sun.nio.cs.ext
 Imports VERAG_PROG_ALLGEMEIN
@@ -74,12 +75,12 @@ Public Class frmMDMDatenverarbetiung
                 btnDatenLaden.Text = "Daten laden"
             Case "UTA" : initDgv_UTA()
                 btnDatenLaden.Text = "Daten laden"
-            Case "ASFINAG" : initDgv_ASFINAG(Not cbxASFINAGNichtAbgerechnet.Checked)
+            Case "ASFINAG" : initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked)
-                btnDatenLaden.Text = "Mautdaten einlesen"
+                btnDatenLaden.Text = "Daten laden"
         End Select
     End Sub
 
-    Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click
+    Private Sub btnREerstellen_Click_1(sender As Object, e As EventArgs) Handles btnREerstellen.Click
         Dim errorTmp = False
         Select Case LIEFERANT
             Case "PLOSE"
@@ -95,7 +96,23 @@ Public Class frmMDMDatenverarbetiung
                     'End If
                 End If
             Case "ASFINAG"
-                MsgBox("Funktion nicht implementiert")
+
+                'cbxASFINAGAbgerechnet.Checked = False
+                'cbxBelegeerstellt.Checked = False
+                Dim abrechnungsDatum As DateTime = Now()
+
+                'MsgBox("Funktion nicht implementiert")
+                'Exit Sub
+
+                If datum = Nothing Then
+                    datum = SQL.getValueTxtBySql("select top (1) Abrechnungsdatum from  Abrechnungsdatum", "ASFINAG")
+                End If
+
+
+                Dim inputKdNr = InputBox("Wenn einzelner Kunde abgerechnet werde soll, bitte KdNr eingeben" & vbNewLine & "Wenn keine KdNr angegeben wird, dann werden alle Kunden abgerechnet:", "Asfinag abrechen")
+
+                genRGAtt_ASFINAG(abrechnungsDatum, datum, inputKdNr)
+                initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked)
 
         End Select
     End Sub
@@ -201,17 +218,50 @@ Public Class frmMDMDatenverarbetiung
         Dim displayFilter = False
         Dim sqlstr As String = ""
 
-        If datum = Nothing Then Exit Sub
+        If datum = Nothing Then
+            datum = SQL.getValueTxtBySql("select top (1) Abrechnungsdatum from  Abrechnungsdatum", "ASFINAG")
+        End If
 
-        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
+        'umschreiben, damit er die Daten nicht aus TTRBody sondern tblMautAsfinag holt.... 
-                        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.ToShortDateString & "')
-                    ORDER BY dbo.TTRBody.CardNumber"
 
+        ' 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.ToShortDateString & "')
+        '             ORDER BY dbo.TTRBody.CardNumber"
+
+
+        '      sqlstr &= "select [cardnumber] as CardNumber
+        ',Adressen.AdressenNr AS KundenNr
+        ',Adressen.[Name 1]
+        '    ,[licenceplate] as vehicleLicensePlate
+        '    ,[turnoverdate] as DeliveryDate
+        '    ,[contractPartner] as ProductCode
+        '    ,[netAmount]
+        '    ,[VATamount]
+        '    ,[additionalData]
+        '    ,[totalAmount] as amountInclVAT
+        'FROM [VERAG].[dbo].[tblAsfinagMaut]
+        'INNER JOIN [VERAG].[dbo].Kreditkarten ON cardnumber = Kreditkarten.KartenNr
+        'INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr"
+
+
+
+        sqlstr &= "select [cardnumber] as CardNumber
+		,Adressen.AdressenNr AS KundenNr
+		,Adressen.[Name 1]
+        ,[contractPartner] as ProductCode
+        ,sum([netAmount]) as Netamount
+        ,sum([VATamount]) as VATAmount
+        ,sum([totalAmount]) as amountInclVAT
+        FROM [VERAG].[dbo].[tblAsfinagMaut]
+        INNER JOIN [VERAG].[dbo].Kreditkarten ON cardnumber = Kreditkarten.KartenNr
+        INNER JOIN [VERAG].[dbo].Adressen ON Adressen.AdressenNr = Kreditkarten.AdressenNr
+        group by  Adressen.AdressenNr,Adressen.[Name 1], contractPartner,CardNumber
+		order by Adressen.AdressenNr"
 
         Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "ASFINAG")
         'DataGridView.DataSource = dt
@@ -460,15 +510,16 @@ Public Class frmMDMDatenverarbetiung
 
     End Sub
 
-    Sub initDgv_ASFINAG(abgerechnet As Boolean)
+    Sub initDgv_ASFINAG(abgerechnet As Boolean, belegeErstellt As Boolean)
 
         'datum = CDate(SQL.getValueTxtBySql("SELECT Abrechnungsdatum FROM Abrechnungsdatum", "ASFINAG"))
-        Dim sqlString = "AND (TTRBody.abrechnungsdatum " & IIf(abgerechnet, "is not null)", "is null)")
+        Dim sqlString = " AND  (TTRBody.abrechnungsdatum " & IIf(abgerechnet, "is not null)", "is null)")
+        sqlString &= " AND (TTRBody.belegerstellungsdatum " & IIf(belegeErstellt, "is not null)", "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
+            .SET_SQL(" SELECT dbo.TTRBody.OBUID,dbo.TTRBody.CardNumber,dbo.TTRBody.receiptNumber,dbo.TTRBody.VATAmount,dbo.TTRBody.amountInclVAT,dbo.TTRBody.abrechnungsdatum,dbo.TTRBody.belegerstellungsdatum, dbo.tblWarenarten.WarenartDE, dbo.CLFArchiv.vehicleLicensePlate
                             FROM dbo.CLFArchiv 
                             RIGHT OUTER JOIN dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.OBUID 
                             LEFT OUTER JOIN dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
@@ -484,48 +535,11 @@ Public Class frmMDMDatenverarbetiung
                 .Columns("OBUID").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
                 .Columns("CardNumber").HeaderText = "Kartennummer"
                 .Columns("abrechnungsdatum").HeaderText = "Abrechnungsdatum"
-                .Columns("receiptNumber").HeaderText = "Rechnugnsnummer"
+                .Columns("belegerstellungsdatum").HeaderText = "Belegerstellung am"
+                .Columns("receiptNumber").HeaderText = "Rechnungsnummer"
                 .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
@@ -564,6 +578,10 @@ Public Class frmMDMDatenverarbetiung
             End If
         Next
 
+        cbxASFINAGAbgerechnet.Visible = False
+        cbxBelegeerstellt.Visible = False
+        cbxTestdaten.Visible = False
+
         Select Case Me.LIEFERANT
             Case "PLOSE"
                 Panel4.Visible = True
@@ -578,9 +596,12 @@ Public Class frmMDMDatenverarbetiung
                 'Panel3.Controls.Add(c)
                 'c.Dock = DockStyle.Fill
             Case "ASFINAG"
+                cbxASFINAGAbgerechnet.Visible = True
+                cbxBelegeerstellt.Visible = True
+                cbxTestdaten.Visible = True
                 Panel4.Visible = False
                 pnlAsfinag.Visible = True
-
+                Exit Sub
         End Select
 
         init()
@@ -737,6 +758,166 @@ Public Class frmMDMDatenverarbetiung
     End Function
 
 
+    Function genRGAtt_ASFINAG(belegerstellungsdatum As DateTime, abrechnungsdatum As Date, inputKdNr As String) As Boolean
+
+        If cbxASFINAGAbgerechnet.Checked = False Then
+            MsgBox("Bitte abgerechnete Daten auswählen!")
+            Return False
+        End If
+        Dim sqlWhere As String = ""
+        If inputKdNr <> "" Then
+            sqlWhere &= " AND Adressen.AdressenNr=" & inputKdNr
+        End If
+
+
+        Dim dt_Main As DataTable = SQL.loadDgvBySql_Param("SELECT KundenNr, cardnumber FROM (SELECT Kreditkarten.KartenNr AS Kartennummer, Adressen.AdressenNr AS KundenNr FROM Adressen INNER JOIN Kreditkarten ON Adressen.AdressenNr = Kreditkarten.AdressenNr) as KUK INNER JOIN [tblAsfinagMaut] as Maut ON KUK.Kartennummer = Maut.cardnumber INNER JOIN Adressen ON KUK.KundenNr = Adressen.AdressenNr where Maut.receiptCreated = 0" & sqlWhere & "Group by KundenNr, cardnumber ", "FMZOLL")
+
+        If dt_Main Is Nothing OrElse dt_Main.Rows.Count = 0 Then
+            MsgBox("Keine Abrechnungsdaten vorhanden" & IIf(inputKdNr <> "", " für KundenNr: " & inputKdNr, "!"))
+            Return False
+        End If
+
+        Dim dt_Main_PDF As DataTable = SQL.loadDgvBySql_Param("SELECT Maut.cardnumber, Maut.licenceplate, Maut.turnoverdate, Maut.contractPartner, Maut.netAmount, Maut.VATamount, Maut.totalAmount, Maut.[additionalData],Maut.receiptNumber, KUK.KundenNr, KUK.[Name 1] FROM (
+                                                            SELECT Kreditkarten.KartenNr AS Kartennummer, Adressen.AdressenNr AS KundenNr, Adressen.[Name 1]
+                                                            FROM Adressen INNER JOIN Kreditkarten ON Adressen.AdressenNr = Kreditkarten.AdressenNr) as KUK
+                                                            INNER JOIN [tblAsfinagMaut] as Maut ON KUK.Kartennummer = Maut.cardnumber
+                                                            INNER JOIN Adressen ON KUK.KundenNr = Adressen.AdressenNr
+                                                            WHERE 1 = 1" & sqlWhere, "FMZOLL")
+
+
+        Dim dt_Main_CSV As DataTable = SQL.loadDgvBySql_Param("SELECT Adressen.AdressenNr, Maut.*
+                                                                FROM Adressen INNER JOIN (Kreditkarten INNER JOIN tblAsfinagMaut as Maut ON Kreditkarten.KartenNr = Maut.cardnumber) ON Adressen.AdressenNr = Kreditkarten.AdressenNr
+                                                                WHERE Adressen.ASFINAGExportCSV = 1 " & sqlWhere & "
+                                                                ORDER BY Adressen.AdressenNr, Maut.cardnumber, Maut.licenceplate, Maut.turnoverdate", "FMZOLL")
+
+        Dim cnt = 0
+
+        Dim displayViewKunden = New DataView(dt_Main, "", "KundenNr", DataViewRowState.CurrentRows)
+        Dim distinctDT_distKunden As DataTable = displayViewKunden.ToTable(True, "KundenNr")
+
+        Dim Info As String = ""
+        If inputKdNr = "" Then
+            Info = "Es wurden " & MyDatagridview1.Rows.Count & " Transaktionen von " & dt_Main.Rows.Count & " Kunden gefunden"
+        Else
+            Dim countTrans = SQL.getValueTxtBySql("SELECT count(cardnumber) FROM (SELECT Kreditkarten.KartenNr AS Kartennummer, Adressen.AdressenNr AS KundenNr FROM Adressen INNER JOIN Kreditkarten ON Adressen.AdressenNr = Kreditkarten.AdressenNr) as KUK INNER JOIN [tblAsfinagMaut] as Maut ON KUK.Kartennummer = Maut.cardnumber INNER JOIN Adressen ON KUK.KundenNr = Adressen.AdressenNr where Maut.receiptCreated = 0" & sqlWhere, "FMZOLL")
+            Info = "Es wurden " & countTrans & " Transaktionen von " & dt_Main.Rows.Count & " Kunden gefunden "
+        End If
+
+        If vbYes = MsgBox(Info & vbNewLine & "Möchten Sie die Rechnungen + Anhänge erstellen?", vbYesNoCancel) Then
+            Dim dir = "F:\FMZoll\Maut\AT\Anlagen" '"C:\Users\d.breimaier\Desktop\Asfinag\Mautberichte" 
+
+            'If Directory.Exists(dir) Then dir &= "_" & Now.ToShortTimeString.Replace(":", "")
+            'Directory.CreateDirectory(dir)
+
+            If dt_Main_PDF IsNot Nothing AndAlso dt_Main_PDF.Rows.Count > 0 Then
+
+                Dim displayView = New DataView(dt_Main_PDF, "", "KundenNr", DataViewRowState.CurrentRows)
+                Dim distinctDT_PDF As DataTable = displayView.ToTable(True, "KundenNr")
+
+
+                For Each pdf As DataRow In distinctDT_PDF.Rows
+
+                    Dim dt_PDF_selected = dt_Main_PDF.Select("KundenNr ='" & pdf.Item(0) & "'").CopyToDataTable
+
+                    genASFINAGAttachmentByKdNr(pdf.Item(0), dt_PDF_selected, dir & "\" & pdf.Item(0) & "_Maut_AT.pdf")
+
+                Next
+
+            End If
+
+
+            If dt_Main_CSV IsNot Nothing AndAlso dt_Main_CSV.Rows.Count > 0 Then
+
+                Dim displayView = New DataView(dt_Main_CSV, "", "AdressenNr", DataViewRowState.CurrentRows)
+                Dim distinctDT_CSV As DataTable = displayView.ToTable(True, "AdressenNr")
+
+
+                For Each csv As DataRow In distinctDT_CSV.Rows
+
+                    Dim dt_CSV_selected = dt_Main_CSV.Select("AdressenNr ='" & csv.Item(0) & "'").CopyToDataTable
+
+
+                    Dim fn As String = dir & "\" & csv.Item(0) & "_Maut_AT.csv"
+                    Dim outFile As System.IO.StreamWriter = My.Computer.FileSystem.OpenTextFileWriter(fn, False)
+                    Dim clmns As String = ""
+                    For i = 0 To dt_CSV_selected.Columns.Count - 1
+                        clmns &= dt_CSV_selected.Columns(i).ColumnName.ToString().Replace(";", ",") & ";"
+                    Next
+                    outFile.WriteLine(clmns)
+                    For i = 0 To dt_CSV_selected.Rows.Count - 1
+                        clmns = ""
+                        For j = 0 To dt_CSV_selected.Columns.Count - 1
+                            clmns &= dt_CSV_selected.Rows(i)(j).ToString.Replace(";", ",") & ";"
+                        Next
+                        outFile.WriteLine(clmns)
+
+                    Next
+                    outFile.Close()
+                Next
+            End If
+
+
+
+            For Each R_ASFINAG In distinctDT_distKunden.Rows
+                Dim SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch = Nothing
+                Dim verarbOK = True
+                If Not genASFINAG_SPEDBUCH_ByKdNr(R_ASFINAG("KundenNr"), SPEDBUCH) Then verarbOK = False
+                If Not genASFINAG_RECHNUNG_BySPEDBUCH(R_ASFINAG("KundenNr"), SPEDBUCH, dat_Sum_Von.Value, dat_Sum_Bis.Value) Then verarbOK = False
+
+                If verarbOK Then
+
+                    If inputKdNr <> "" Then
+                        Dim result As DataRow() = dt_Main.Select("KundenNr ='" & R_ASFINAG("KundenNr") & "'")
+                        For Each row As DataRow In result
+                            SQL.doSQL("UPDATE dbo.TTRBody SET belegerstellungsdatum = '" & belegerstellungsdatum & "' WHERE (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (FileCreationDate <='" & belegerstellungsdatum & "') AND (abrechnungsdatum = '" & abrechnungsdatum & "') And belegerstellungsdatum is null And CardNumber = " & row.Item("cardnumber") & "", "ASFINAG")
+                        Next
+
+                    Else
+                        SQL.doSQL("UPDATE dbo.TTRBody SET belegerstellungsdatum = '" & belegerstellungsdatum & "' WHERE (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (FileCreationDate <='" & belegerstellungsdatum & "') AND (abrechnungsdatum = '" & abrechnungsdatum & "') And belegerstellungsdatum is null", "ASFINAG")
+                    End If
+
+
+                    Dim results As DataRow() = dt_Main.Select("KundenNr ='" & R_ASFINAG("KundenNr") & "'")
+                    For Each r As DataRow In results
+                        SQL.doSQL("UPDATE [tblAsfinagMaut] SET receiptCreated = 1 WHERE cardnumber = " & r.Item("cardnumber") & " AND receiptCreated = 0", "FMZOLL")
+                    Next
+                End If
+
+                If True Then 'cnt Mod 10 = 0 Then
+                    txtPloseAnh_Einarbeitung.Text = cnt & " / " & dt_Main.Rows.Count
+                    Dim proz As Double = (cnt / dt_Main.Rows.Count) * 100
+                    pbPloseAnh_Proz.Value = proz
+                    lblPloseAnh_Proz.Text = proz.ToString("N2") & " %"
+                    'GroupBox12.Refresh()
+                    My.Application.DoEvents()
+                End If
+                cnt += 1
+            Next
+
+            ' ANHÄNGE WERDEN NCIHT BENÖTIGT::
+            'Alle Alangen im foglenden VZ löschen und die aktuellen kopieren:
+            'Dim dirAnhang = "F:\FMZoll\Maut\PLOSE\Anlagen\"
+            'If Directory.Exists(dirAnhang) Then 'Directory.Delete(dirAnhang, True)
+            '    For Each f In Directory.GetFiles(dirAnhang)
+            '        File.Delete(f)
+            '    Next
+            'End If
+            'If Not Directory.Exists(dirAnhang) Then Directory.CreateDirectory(dirAnhang)
+
+            'For Each f In Directory.GetFiles(dir)
+            '    File.Copy(f, dirAnhang & (New FileInfo(f)).Name)
+            'Next
+
+            pbPloseAnh_Proz.Value = 100
+            txtPloseAnh_Einarbeitung.Text = dt_Main.Rows.Count & " / " & dt_Main.Rows.Count
+            lblPloseAnh_Proz.Text = "100.00 %"
+
+            Return True
+        End If
+        Return False
+    End Function
+
+
     Function genPLOSEInsertMautD(von As Date, bis As Date) As Boolean
         Try
             pic.Visible = False
@@ -1260,6 +1441,173 @@ Public Class frmMDMDatenverarbetiung
 
     End Function
 
+
+    Function genASFINAGAttachmentByKdNr(KdNr As Integer, dt As DataTable, tmpPath As String)
+        Try
+
+
+            If dt Is DBNull.Value Then Return ""
+            If dt.Rows.Count = 0 Then Return ""
+
+            Dim rpt As New rptASFINAG_Anhang
+
+            rpt.DataSource = dt
+
+            rpt.txtKunde.Text = KdNr & " " & New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr).FullName
+            rpt.lblRgDatum.Text = datPloseAnhang.Value.ToShortDateString
+
+            rpt.GroupHeaderKz.DataField = "licenceplate" 'Gruppierung
+
+
+            'rpt.txtNettoKzSum.Visible = False
+            'rpt.txtNettoGesSum.Visible = False
+            'rpt.txtNetto.Visible = False
+            'rpt.txtNettoKatSum.Visible = False
+            'rpt.lblNetto.Visible = False
+
+            'rpt.txtMWSTKzSum.Visible = False
+            'rpt.txtMWSTGEsSum.Visible = False
+            'rpt.txtMWST.Visible = False
+            'rpt.txtMWSTKatSum.Visible = False
+            'rpt.lblMWST.Visible = False
+
+            'rpt.lblBrutto.Text = "Total Amount ( EUR )"
+            'rpt.Label4.Text = bis.ToShortDateString
+            'rpt.Label2.Text = "UTA-KundenNr:"
+            'rpt.TextBox1.Text = UTAKdNr
+            rpt.Label1.Text = " ASFINAG"
+
+            ' rpt.lblSummeKennzeichen.Visible = False
+            rpt.lblService.Visible = False
+
+            rpt.lblSummeKennzeichen.Location = New PointF(rpt.lblSummeKennzeichen.Location.X + 4.5, rpt.lblSummeKennzeichen.Location.Y)
+            'rpt.lblSumKategorie.Location = New PointF(rpt.lblSumKategorie.Location.X + 4.5, rpt.lblSumKategorie.Location.Y)
+            rpt.lblGessumme.Location = New PointF(rpt.lblGessumme.Location.X + 4.5, rpt.lblGessumme.Location.Y)
+
+            Dim sumNetto As Double = 0
+            Dim sumMWST As Double = 0
+            Dim sumBrutto As Double = 0
+
+            Dim sumNettoKat As Double = 0
+            Dim sumMWSTKat As Double = 0
+            Dim sumBruttoKat As Double = 0
+
+            Dim sumNettoGes As Double = 0
+            Dim sumMWSTGes As Double = 0
+            Dim sumBruttoGes As Double = 0
+
+            Dim cntKat = 0
+            Dim cnt = 0
+            rpt.GroupFooterKat.Visible = False
+
+            AddHandler rpt.Detail.Format, Sub()
+                                              ' If cnt = 0 Then
+                                              rpt.txtKunde.Text = SQL.isDbnullEmpty(rpt.Fields.Item("KundenNr").Value, "")
+                                              rpt.txtKunde.Text &= " " & SQL.isDbnullEmpty(rpt.Fields.Item("Name 1").Value, "")
+                                              rpt.txtLand.Text = "AT"
+                                              ' End If
+
+                                              '   rpt.txtProduktBeschreibung.Text = sql.isDbnullEmpty(rpt.Fields.Item("BC_DESCR").Value, "")
+                                              rpt.txtProdukt.Text = SQL.isDbnullEmpty(rpt.Fields.Item("contractPartner").Value, "") 'sql.isDbnullEmpty(rpt.Fields.Item("plose_ProduktCode").Value, "") & " - " & sql.isDbnullEmpty(rpt.Fields.Item("plose_Produktbeschreibung").Value, "")
+
+
+                                              rpt.txtKartennummer.Text = SQL.isDbnullEmpty(rpt.Fields.Item("cardnumber").Value, "")
+                                              rpt.txtAusgang.Text = "" 'SQL.isDbnullEmpty(rpt.Fields.Item("Exit Terminal Description").Value, "")
+                                              'rpt.txtLand.Text = SQL.isDbnullEmpty(rpt.Fields.Item("Transaction Country").Value, "")
+                                              rpt.txtDatum.Text = SQL.isDbnullEmpty(rpt.Fields.Item("turnoverdate").Value, "")
+                                              rpt.txtEingang.Text = SQL.isDbnullEmpty(rpt.Fields.Item("receiptNumber").Value, "")
+
+                                              rpt.txtNetto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("netAmount").Value, 2, "")
+                                              rpt.txtMWST.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("VATamount").Value, 2, "")
+                                              rpt.txtBrutto.Text = SQL.isDbnullEmptyDbl(rpt.Fields.Item("totalAmount").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("totalAmount").Value, 4, 0)
+                                              cnt += 1
+                                          End Sub
+
+            AddHandler rpt.GroupHeaderKz.Format, Sub()
+                                                     rpt.txtKennzeichen.Text = SQL.isDbnullEmpty(rpt.Fields.Item("licenceplate").Value, "")
+                                                     If rpt.txtKennzeichen.Text = "" Then rpt.lblKennzeichen.Visible = False
+                                                 End Sub
+            AddHandler rpt.GroupHeaderKat.Format, Sub()
+                                                      rpt.lblKategorie.Text = "MAUTGEBÜHR"
+                                                  End Sub
+
+            AddHandler rpt.GroupFooterKz.Format, Sub()
+                                                     rpt.txtNettoKzSum.Text = sumNetto.ToString("N2")
+                                                     rpt.txtMWSTKzSum.Text = sumMWST.ToString("N2")
+                                                     rpt.txtBruttoKzSum.Text = sumBrutto.ToString("N2")
+                                                     sumNettoGes += sumNetto
+                                                     sumMWSTGes += sumMWST
+                                                     sumBruttoGes += sumBrutto
+
+                                                     sumNetto = 0
+                                                     sumMWST = 0
+                                                     sumBrutto = 0
+
+                                                     rpt.lblSummeKennzeichen.Text = rpt.lblSummeKennzeichen.Text.Replace("Kennzeichen", SQL.isDbnullEmpty(rpt.Fields.Item("licenceplate").Value, ""))
+                                                 End Sub
+
+
+
+            AddHandler rpt.GroupFooterKat.Format, Sub()
+                                                      sumNettoKat += sumNetto
+                                                      sumMWSTKat += sumMWST
+                                                      sumBruttoKat += sumBrutto
+                                                      sumNetto = 0
+                                                      sumMWST = 0
+                                                      sumBrutto = 0
+
+                                                      rpt.txtNettoKatSum.Text = sumNettoKat.ToString("N2")
+                                                      rpt.txtMWSTKatSum.Text = sumMWSTKat.ToString("N2")
+                                                      rpt.txtBruttoKatSum.Text = sumBruttoKat.ToString("N2")
+                                                      cntKat += 1
+                                                  End Sub
+            AddHandler rpt.ReportFooter1.Format, Sub()
+                                                     'sumNettoGes += sumNettoKat
+                                                     'sumMWSTGes += sumMWSTKat
+                                                     'sumBruttoGes += sumBruttoKat
+                                                     sumNettoKat = 0
+                                                     sumMWSTKat = 0
+                                                     sumBruttoKat = 0
+
+                                                     sumNetto = 0
+                                                     sumMWST = 0
+                                                     sumBrutto = 0
+
+                                                     rpt.txtNettoGesSum.Text = sumNettoGes.ToString("N2")
+                                                     rpt.txtMWSTGEsSum.Text = sumMWSTGes.ToString("N2")
+                                                     rpt.txtBruttoGesSum.Text = sumBruttoGes.ToString("N2")
+
+
+
+                                                     'If cntKat <= 1 Then
+                                                     '    rpt.GroupFooterKat.Visible = False
+                                                     'End If
+                                                 End Sub
+
+            'print.Viewer.LoadDocument(rpt)
+            'print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
+            'print.Show()
+
+            Dim p As New GrapeCity.ActiveReports.Export.Pdf.Section.PdfExport
+            rpt.Run(False)
+            p.NeverEmbedFonts = ""
+            p.Export(rpt.Document, tmpPath)
+
+            rpt.Dispose()
+
+            Return tmpPath
+
+        Catch ex As System.Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return ""
+
+    End Function
+
     Function genPLOSE_SPEDBUCH_ByKdNr(KdNr As String, PLOSEKundenNr As String, von As Date, bis As Date, ByRef SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch)
         Try
 
@@ -1317,6 +1665,67 @@ Public Class frmMDMDatenverarbetiung
     End Function
 
 
+    Function genASFINAG_SPEDBUCH_ByKdNr(KdNr As String, ByRef SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch)
+        Try
+
+            'MsgBox("Funktion noch nicht vollständig implementiert!")
+            'Exit Function
+
+            'Dim displayFilter = False
+            'Dim sqlstr As String = ""
+
+            'sqlstr &= " SELECT 	 * "
+            'sqlstr &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode "
+            'sqlstr &= " WHERE 1=1 "
+            'sqlstr &= " AND plose_Fakturiert=0 "
+            'sqlstr &= " AND plose_POLSEKundennummer = '" & KdNr & "' "
+            'sqlstr &= " AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' "
+
+            ''  sqlstr &= " group by plose_ProduktCode"
+            'sqlstr &= " order by plp_Land, plose_DatumTransaktion"
+
+            'Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
+
+            Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(KdNr)
+            SPEDBUCH = New VERAG_PROG_ALLGEMEIN.cSpeditionsbuch
+
+            Dim OffertenNr = 11
+            Dim Abfertigungsart = 10
+
+            SPEDBUCH.FilialenNr = 4814
+            SPEDBUCH.AbfertigungsNr = VERAG_PROG_ALLGEMEIN.cAllgemein.getMaxPosNrIncrement(SPEDBUCH.FilialenNr, Now.Year)
+            SPEDBUCH.NewUNTER_NR()
+
+            SPEDBUCH.Vermittler = AD.Ordnungsbegriff
+            SPEDBUCH.VermittlerKundenNr = KdNr
+            SPEDBUCH.VermittlerOffertenNr = OffertenNr
+            SPEDBUCH.Abfertigungsdatum = datPloseAnhang.Value.ToShortDateString
+
+            SPEDBUCH.Abfertigungsart = Abfertigungsart
+            SPEDBUCH.Bar = 0
+            SPEDBUCH.Fakturiert = 1
+            SPEDBUCH.AnzahlSonstiges = 1
+            SPEDBUCH.Abfertigungsanzahl = 1
+
+            SPEDBUCH.AvisUhrzeit = Nothing
+            SPEDBUCH.Umrechnungskurs = Nothing
+            SPEDBUCH.veoerz_basbtg = Nothing
+            SPEDBUCH.Sicherheitsbetrag = Nothing
+
+            SPEDBUCH.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+
+
+            Return SPEDBUCH.SAVE
+
+        Catch ex As System.Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return False
+
+    End Function
+
+
+
     Function genPLOSE_RECHNUNG_BySPEDBUCH(KdNr As String, PLOSEKundenNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, von As Date, bis As Date)
         Try
 
@@ -1406,7 +1815,7 @@ Public Class frmMDMDatenverarbetiung
             sqlstr &= " FROM tblPLOSE_Details INNER JOIN [tblPLOSE_Produktbeschreibung] on plose_ProduktCode=plp_ProductCode "
             sqlstr &= " WHERE 1=1 "
             sqlstr &= " AND plose_Fakturiert=0  "
-            sqlstr &= " AND  plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " )  "
+            sqlstr &= " AND plose_ProduktCode NOT IN (" & ProduktCode_NOT_IN & " )  "
             sqlstr &= " AND plose_POLSEKundennummer = '" & PLOSEKundenNr & "' "
             sqlstr &= " AND plp_LeistungsNr is not null "
             sqlstr &= " AND plose_DatumTransaktion between '" & von.ToShortDateString & "' and '" & bis.ToShortDateString & "' "
@@ -1475,6 +1884,204 @@ Public Class frmMDMDatenverarbetiung
 
     End Function
 
+    Function genASFINAG_RECHNUNG_BySPEDBUCH(KdNr As String, SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, von As Date, bis As Date)
+        Try
+
+            'MsgBox("Funktion noch nicht vollständig implementiert!")
+            'Exit Function
+
+            Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(SPEDBUCH.VermittlerKundenNr)
+            Dim KD As New VERAG_PROG_ALLGEMEIN.cKunde(SPEDBUCH.VermittlerKundenNr)
+            Dim RG As New VERAG_PROG_ALLGEMEIN.cRechnungsausgang
+
+            Dim OffertenNr = 11
+            Dim Abfertigungsart = 10
+
+            RG.FilialenNr = SPEDBUCH.FilialenNr
+            RG.AbfertigungsNr = SPEDBUCH.AbfertigungsNr
+            RG.SpeditionsbuchUnterNr = SPEDBUCH.UnterNr
+            RG.UnterNr = RG.getMaxRGUnterNr()
+
+            RG.Buchungsjahr = cRKSV.getGJ(datPloseAnhang.Value) 'If(Now.Month = 1, Now.Year - 1, Now.Year)
+            RG.FilialenNr = SPEDBUCH.FilialenNr
+            RG.Abfertigungsdatum = SPEDBUCH.Abfertigungsdatum
+            RG.Sammelrechnung = 6 'MAUT/DIESEL
+            RG.BelegartenKz = "AR"
+            RG.BelegartenNr = 70
+            RG.BelegartenBez = "Rechnung"
+            RG.Vorzeichen = "+"
+
+            RG.VermittlerKundenNr = AD.AdressenNr
+            RG.VermittlerLandKz = AD.LandKz
+            RG.VermittlerName_1 = AD.Name_1
+            RG.VermittlerName_2 = AD.Name_2
+            RG.VermittlerOffertenNr = OffertenNr
+            RG.VermittlerOrt = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, ""))
+            RG.VermittlerStraße = AD.Straße
+            RG.Rechnung_an = 3
+            RG.OffertenNr = OffertenNr
+
+            RG.KundenNrZentrale = KD.KundenNrZentrale
+            RG.RechnungsKundenNr = AD.AdressenNr
+            RG.RechnungsLandKz = AD.LandKz
+            RG.RechnungsName_1 = AD.Name_1
+            RG.RechnungsName_2 = AD.Name_2
+            RG.RechnungsOrt = (If(AD.LandKz, "") & " " & If(AD.PLZ, "") & " " & If(AD.Ort, ""))
+            RG.RechnungsStraße = AD.Straße
+
+            RG.RechnungsUstIdKz = AD.UstIdKz
+            RG.RechnungsUstIdNr = AD.UstIdNr
+            RG.RechnungsUstIdGeprüft = AD.UstIdGeprüft
+
+            RG.Lastschrift = KD.Lastschrift
+            RG.Kunden_SVS = KD.SVS
+            RG.Steuerschlüssel = KD.Steuerschlüssel
+            RG.Vorkasse = KD.Vorkasse
+            RG.Vorlageprovision_Proz = KD.Vorlageprovision
+            RG.Kreditaufwendungen_Proz = KD.Kreditaufwendungen
+            RG.RechnungSprache = "DE"
+
+
+            RG.Anlage_1 = "Email Anhang"
+            RG.Anlage_2 = ""
+            RG.Anlage_3 = ""
+            RG.Anlage_4 = ""
+            RG.Anlage_5 = ""
+            RG.Anlage_6 = ""
+
+
+            RG.Text = ""
+            RG.EMailRechnungstext = Nothing ' ""
+
+            RG.Firma_ID = 15
+            RG.Nettozahlungsziel = KD.Zahlungsziel
+
+            RG.SteuerpflichtigerGesamtbetrag = 0
+            RG.SteuerfreierGesamtbetrag = 0
+            RG.Status = 9 '<= Status während der Erfassung über die Maut/Diesel-Schnittstelle - Nach Abschluss der Datenübernahme Änderung auf 0
+
+            RG.[Vorkosten] = 0
+            RG.[Erlös] = 0
+            RG.[Buchungsjahr] = 0
+            RG.[Währungscode] = "EUR"
+            RG.ReErfZeitstempel = Now
+
+
+            RG.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+
+            RG.Buchungsjahr = cRKSV.getGJ(RG.RechnungsDatum)
+
+            Dim sqlstr As String = "SELECT '135' as leistungsNr, [contractPartner] as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount <> 0 Group by [contractPartner]
+                                    UNION
+                                    SELECT '153' as leistungsNr, [contractPartner] as ProductCode, sum([netAmount]) as netamount ,sum([VATamount]) as Vatamount ,sum([totalAmount]) as amountInclVAT FROM Kreditkarten INNER JOIN tblAsfinagMaut ON Kreditkarten.KartenNr = tblAsfinagMaut.cardnumber Where Kreditkarten.AdressenNr= '" & KD.KundenNr & "' and tblAsfinagMaut.VATamount = 0 Group by [contractPartner]"
+
+            Dim dt As DataTable = SQL.loadDgvBySql_Param(sqlstr, "FMZOLL")
+
+            For Each r In dt.Rows
+
+
+                Dim NettoBetrag As Double = r("netamount")
+                Dim BruttoBetrag As Double = r("amountInclVAT")
+                Dim LeistungsNr As Integer = r("leistungsNr")
+                Dim OFFERTE As New VERAG_PROG_ALLGEMEIN.cOfferte(KdNr, OffertenNr, True)
+
+                allPlosePos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag) 'kann generisch verwendet werden
+
+                'Rückvergütung Consortio !!
+                'If r("plp_LeistungsNr") = "190" Then '(PRODUCTCODE=301; VERAG-LEISTUNGSNR=190!!
+                '    rabattPlosePos(RG, OFFERTE, LeistungsNr, NettoBetrag, BruttoBetrag)
+                'End If
+            Next
+
+
+            Dim dtSt As DataTable = SQL.loadDgvBySql("SELECT TOP 1 isnull([Steuersatz %],0),isnull([Steuerbezeichnung],'')  FROM [Steuertabelle] WHERE [Steuerschlüssel]='" & RG.Steuerschlüssel & "'", "FMZOLL")
+            If dtSt IsNot Nothing AndAlso dtSt.Rows.Count > 0 Then
+                RG.Steuersatz_Proz = dtSt.Rows(0)(0)
+            End If
+
+            cFakturierung.setGesamtBetraege(RG)
+
+            RG.Text = (cFakturierung.przRechnungstextTXT(RG, SPEDBUCH) & vbNewLine & cFakturierung.przRechnungstextZZ(RG)).Trim
+
+            ' Call usrCntlFaktAbrechnung.przSVSRVS(RG)      ' SVS/RVS errechnen
+            '  Call przSKR()         ' SKR errechnen
+
+            'Call usrCntlFaktAbrechnung.przVL(RG)          ' Vorlageprovision errechnen
+            'Call usrCntlFaktAbrechnung.przKapitalbereitstellung(RG) 'Kapitalbereitstellung errechnen
+
+            ' boolFehler = fktBGeb(RECHNUNG.[RK_ID], RECHNUNG.Steuersatz_Proz, RECHNUNG.[Sammelrechnung], RECHNUNG.[BelegartenNr]) ' Bearbeitungsgebühr errechnen
+
+            ' Call usrCntlFaktAbrechnung.przKA(RG)          ' Kreditaufwendungen errechnen
+            Call usrCntlFaktAbrechnung.przFixeTaxe(RG)    ' Fixe Taxe errechnen
+            Call usrCntlFaktAbrechnung.przPP(RG)          ' Porto/Papiere errechnen
+
+            Call usrCntlFaktAbrechnung.przBS415(RG)       ' Bankspesen errechnen
+
+            If RG.SAVE Then
+                ' FAKTURIERT eintragen
+                'For Each r In dt.Rows
+                '    SQL.doSQL("UPDATE [tblPLOSE_Details]SET plose_Fakturiert=1, plose_FakturiertDatum='" & datPloseAnhang.Value & "' where plose_Id='" & r("plose_id") & "'", "FMZOLL")
+                'Next
+                Return True
+            Else
+                Return False
+            End If
+
+        Catch ex As System.Exception
+            MsgBox(ex.Message & ex.StackTrace)
+        End Try
+        Return ""
+
+        '################################  Code von FMZOLL #########################################################
+
+        '                Do Until rstOffPos.EOF
+        '                    'Offertenposition als Rechnungsposition übernehmen.
+        '4630             With rstRP
+        '4640                 .AddNew
+        '4650                 !RK_ID = rstRK!RK_ID
+        '4660                 !LeistungsNr = rstOffPos!LeistungsNr
+        '4670                 If rstRK![Steuersatz %] = 0 Then    ' keine Steuerpflicht
+        '4680                     ![steuerpflichtig] = False
+        '4690                 Else    ' LeistungsNr bestimmt Steuerpflicht
+        '4700                     ![steuerpflichtig] = DLookup("[Steuerpflichtig]", "Leistungen", "[LeistungsNr]=" & ![LeistungsNr])
+        '4710                 End If
+        '4720                 !LeistungsBez = rstOffPos!LeistungsBez
+        '4730                 !BerechnungsartNr = rstOffPos!BerechnungsartNr
+        '4740                 !Preis = fktEuro(rstOffPos!Preis, rstKu!Währungscode, rstRK!Währungscode)
+        '4750                 !Anzahl = rstOffPos!Anzahl
+        '4760                 !BGebLeistungsNr = rstOffPos!BGebLeistungsNr
+        '4770                 !BGebProzent = rstOffPos!BGebProzent
+        '4780                 !BGebMinBetrag = rstOffPos!BGebMinBetrag
+        '4790                 If Not IsNull(![Preis]) Then
+        '4800                     ![Preisbindung] = True
+        '4810                 Else
+        '4820                     ![Preisbindung] = False
+        '4830                     Select Case rstRK!OffertenNr
+        '                             Case 11 'LKW Maut AT
+        '4840                             Select Case !LeistungsNr
+        '                                     Case 135                        ' Mautberechnung für Österreich steuerpflichtig
+        '4850                                     !Anzahl = 1
+        '4860                                     !Preis = DSum("[Nettobetrag]", "qryMautbetrag_AT_Stpfl", "[Kundennummer]=" & rstRK![RechnungsKundenNr])
+        '4870                                 Case 153                        ' Mautberechnung für Österreich steuerfrei
+        '4880                                     !Anzahl = 1
+        '4890                                     !Preis = DSum("[Nettobetrag]", "qryMautbetrag_AT_Stfrei", "[Kundennummer]=" & rstRK![RechnungsKundenNr])
+        '4900                             End Select
+
+        '            .
+        '            .
+        '            .
+        '            .
+        '               If IsNull(![Preis]) Or ![Preis] = 0 Or IsNull(![Anzahl]) Or ![Anzahl] = 0 Then
+        '                 .Delete
+        '                .
+        '                .
+        '                .
+        '                .
+
+        '################################  Code von FMZOLL #########################################################
+
+    End Function
+
 
     Function allPlosePos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double)
         Try
@@ -1521,6 +2128,7 @@ Public Class frmMDMDatenverarbetiung
         End Try
         Return False
     End Function
+
     Function rabattPlosePos(ByRef RG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, OFFERTE As VERAG_PROG_ALLGEMEIN.cOfferte, LeistungsNr As Integer, NettoBetrag As Double, BruttoBetrag As Double)
         Try
             Dim POS As New VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen()
@@ -1829,7 +2437,11 @@ Public Class frmMDMDatenverarbetiung
             MyDatagridview1.ClearSelection()
             MyDatagridview1.DataSource = dtAsfinagKartenpruef
             Dim count = MyDatagridview1.Rows.Count()
-            If count > 0 Then lblProzPruef.Text = CInt(cnt / count * 100) & " %" '100
+            If count > 0 Then
+                lblProzPruef.Text = CInt(cnt / count * 100) & " %" '100
+            Else
+                cbxASFINAGAbgerechnet.Checked = True
+            End If
         Catch ex As Exception
             MsgBox(ex.Message & ex.StackTrace)
             pruefData_ASFINAG = False
@@ -2016,26 +2628,27 @@ Public Class frmMDMDatenverarbetiung
         initLieferant("ASFINAG", sender)
     End Sub
 
-    Private Sub Button9_Click(sender As Object, e As EventArgs) Handles bntDatumsetzen.Click
+    Private Function setFakturiert_ASFINAG() As Boolean
         'Abrechnungsdatum setzen
 
-        If cbxASFINAGNichtAbgerechnet.Checked = False Then
+        If cbxASFINAGAbgerechnet.Checked = True Then
-            cbxASFINAGNichtAbgerechnet.Checked = True
+            cbxASFINAGAbgerechnet.Checked = False
         End If
 
         If MyDatagridview1.Rows.Count = 0 Then
-            MsgBox("keine Daten zum abrechnen vorhanden!")
+            MsgBox("Keine Daten zum Abrechnen vorhanden!")
-            Exit Sub
+            Return False
         End If
 
         Dim f As New frmDatumsabfrage()
         f.ShowDialog()
         If f.DialogResult = DialogResult.OK Then
+            datum = f.Datum
             SQL.doSQL("DELETE FROM tblAsfinagMaut", "FMZOLL")
             If SQL.doSQL("Update Abrechnungsdatum SET Abrechnungsdatum = '" & f.Datum.ToShortDateString & "'", "ASFINAG") Then
-                If SQL.doSQL("UPDATE dbo.TTRBody SET Abrechnungsdatum = '" & f.Datum.ToShortDateString & "' WHERE (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (FileCreationDate <= '" & f.Datum.ToShortDateString & "') AND (abrechnungsdatum IS NULL)", "ASFINAG") Then
+                If SQL.doSQL("UPDATE dbo.TTRBody SET Abrechnungsdatum = '" & f.Datum.ToShortDateString & "' WHERE (PKHistory = 0) AND (PKFileName LIKE N'" & checkifTestfiles() & ".%') AND (FileCreationDate <= '" & f.Datum.ToShortDateString & "') AND abrechnungsdatum IS NULL AND belegerstellungsdatum IS NULL", "ASFINAG") Then
 
-                    Dim dt As DataTable = SQL.loadDgvBySql("Select dbo.TTRBody.OBUID, dbo.TTRBody.CardNumber, dbo.TTRBody.receiptNumber, dbo.TTRBody.VATAmount, dbo.TTRBody.amountInclVAT, dbo.TTRBody.abrechnungsdatum, dbo.tblWarenarten.WarenartDE, dbo.CLFArchiv.vehicleLicensePlate, dbo.TTRBody.InfoField, dbo.TTRBody.ProductCode, dbo.TTRBody.Town 
+                    Dim dt As DataTable = SQL.loadDgvBySql("Select dbo.TTRBody.OBUID, dbo.TTRBody.CardNumber, dbo.TTRBody.receiptNumber, dbo.TTRBody.VATAmount, dbo.TTRBody.amountInclVAT, dbo.TTRBody.DeliveryDate,dbo.TTRBody.abrechnungsdatum,dbo.TTRBody.belegerstellungsdatum, dbo.tblWarenarten.WarenartDE, dbo.CLFArchiv.vehicleLicensePlate, dbo.TTRBody.InfoField, dbo.TTRBody.ProductCode, dbo.TTRBody.Town 
                             From dbo.CLFArchiv 
                             RIGHT OUTER Join dbo.TTRBody ON dbo.CLFArchiv.OBUID = dbo.TTRBody.OBUID 
                             LEFT OUTER Join dbo.tblWarenarten ON dbo.TTRBody.ProductCode = dbo.tblWarenarten.ProductCode
@@ -2043,34 +2656,37 @@ Public Class frmMDMDatenverarbetiung
                             Order By dbo.TTRBody.CardNumber, dbo.TTRBody.FileCreationDate, dbo.TTRBody.PKHistory, dbo.TTRBody.PKFileName, dbo.TTRBody.PKLine", "ASFINAG")
                     If dt.Rows.Count = 0 Then
                         MsgBox("Es wurden keine Daten in tblAsfinagMaut geschrieben!")
-                        Exit Sub
+                        Return False
                     End If
                     For Each row As DataRow In dt.Rows
                         Dim maut As New cAsfinagMaut()
                         maut.cardnumber = row.Item("CardNumber")
                         maut.licenceplate = IIf(Not IsDBNull(row.Item("vehicleLicensePlate")), row.Item("vehicleLicensePlate"), row.Item("InfoField"))
-                        maut.turnoverdate = row.Item("abrechnungsdatum")
+                        maut.turnoverdate = row.Item("DeliveryDate")
                         maut.contractPartner = "ASFINAG " & IIf(Not IsDBNull(row.Item("WarenartDE")), row.Item("WarenartDE"), "Product Code " & row.Item("ProductCode"))
                         maut.netAmount = CDbl(row.Item("amountInclVAT")) - CDbl(row.Item("VATAmount"))
                         maut.VATamount = CDbl(row.Item("VATAmount"))
                         maut.totalAmount = CDbl(row.Item("amountInclVAT"))
                         maut.additionalData = row.Item("Town") 'wird nicht mehr verwendet????
+                        maut.receiptnumber = row.Item("receiptNumber")
+                        maut.receiptCreated = IIf(IsDBNull(row.Item("belegerstellungsdatum")), False, True)
                         maut.SAVE()
                     Next
                     MsgBox("Abrechnungsdatum gesetzt!")
                 End If
             End If
 
-            cbxASFINAGNichtAbgerechnet.Checked = False
+            cbxASFINAGAbgerechnet.Checked = True
             'initDgv_ASFINAG(Not cbxASFINAGNichtAbgerechnet.Checked)
         End If
 
 
-    End Sub
+    End Function
+
 
     Private Sub Button10_Click(sender As Object, e As EventArgs) Handles bntDatumzuruecksetzen.Click
-        If cbxASFINAGNichtAbgerechnet.Checked = True Then
+        If cbxASFINAGAbgerechnet.Checked = False Then
-            cbxASFINAGNichtAbgerechnet.Checked = False
+            cbxASFINAGAbgerechnet.Checked = True
         End If
 
         If MyDatagridview1.Rows.Count = 0 Then
@@ -2078,12 +2694,15 @@ Public Class frmMDMDatenverarbetiung
             Exit Sub
         End If
 
-        Dim datum = CDate(SQL.getValueTxtBySql("Select Abrechnungsdatum FROM Abrechnungsdatum", "ASFINAG"))
+        Dim datumDel = CDate(SQL.getValueTxtBySql("Select Abrechnungsdatum FROM Abrechnungsdatum", "ASFINAG"))
+
+        If MsgBox("Möchten Sie das Abrechnungsdatum vom " & datumDel.ToShortDateString & " zurücksetzen?" & vbNewLine & "Nur für Transaktionen möglich, zu denen es noch keine Rechnung erstellt wurde!", vbYesNoCancel) = MsgBoxResult.Yes Then
+            If SQL.doSQL("UPDATE dbo.TTRBody Set Abrechnungsdatum = NULL WHERE Abrechnungsdatum = '" & datumDel & "' AND (PKHistory = 0) AND (PKFileName LIKE '%" & checkifTestfiles() & ".%') AND belegerstellungsdatum IS NULL", "ASFINAG") Then
+                If SQL.doSQL("DELETE FROM tblAsfinagMaut", "FMZOLL") Then
+                    MsgBox("Abrechnungsdatum zurückgesetzt!")
+                End If
+                cbxASFINAGAbgerechnet.Checked = False
 
-        If MsgBox("Möchten Sie das Abrechnungsdatum vom " & datum.ToShortDateString & " zurücksetzen?", vbYesNoCancel) = MsgBoxResult.Yes Then
-            If SQL.doSQL("UPDATE dbo.TTRBody Set Abrechnungsdatum = NULL WHERE Abrechnungsdatum = '" & datum & "' AND (PKHistory = 0) AND (PKFileName LIKE '%" & checkifTestfiles() & ".%')", "ASFINAG") Then
-                MsgBox("Abrechnungsdatum zurückgesetzt!")
-                cbxASFINAGNichtAbgerechnet.Checked = True
                 'initDgv_ASFINAG(cbxASFINAGNichtAbgerechnet.Checked)
             End If
         End If
@@ -2103,7 +2722,29 @@ Public Class frmMDMDatenverarbetiung
 
     End Function
 
-    Private Sub cbxASFINAGNichtAbgerechnet_CheckedChanged(sender As Object, e As EventArgs) Handles cbxASFINAGNichtAbgerechnet.CheckedChanged
+    Private Sub cbxASFINAGabgerechnet_CheckedChanged(sender As Object, e As EventArgs) Handles cbxASFINAGAbgerechnet.CheckedChanged
-        If Me.LIEFERANT = "ASFINAG" Then initDgv_ASFINAG(Not cbxASFINAGNichtAbgerechnet.Checked)
+        If Me.LIEFERANT = "ASFINAG" Then
+            If Not cbxASFINAGAbgerechnet.Checked Then cbxBelegeerstellt.Checked = False
+            initDgv_ASFINAG(cbxASFINAGAbgerechnet.Checked, cbxBelegeerstellt.Checked)
+        End If
+    End Sub
+
+    Private Sub bntDatumsetzen_Click(sender As Object, e As EventArgs) Handles bntDatumsetzen.Click
+        setFakturiert_ASFINAG()
+    End Sub
+
+    Private Sub cbxBelegeerstellt_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBelegeerstellt.CheckedChanged
+
+        If cbxBelegeerstellt.Checked Then
+            btnREerstellen.Enabled = False
+            bntDatumsetzen.Enabled = False
+            bntDatumzuruecksetzen.Enabled = False
+        Else
+            btnREerstellen.Enabled = True
+            bntDatumsetzen.Enabled = True
+            bntDatumzuruecksetzen.Enabled = True
+        End If
+
+
     End Sub
 End Class

SDL/mdm/rptASFINAG_TransaktionenSumary.Designer.vb

@@ -30,6 +30,11 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         Me.Line3 = New GrapeCity.ActiveReports.SectionReportModel.Line()
         Me.lblNetto = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblMWST = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblName1 = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblSumNet = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblSumVat = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.lblSumBrt = New GrapeCity.ActiveReports.SectionReportModel.Label()
+        Me.Label10 = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.PageFooter = New GrapeCity.ActiveReports.SectionReportModel.PageFooter()
         Me.Label28 = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.Line2 = New GrapeCity.ActiveReports.SectionReportModel.Line()
@@ -48,11 +53,6 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         Me.lblSumMwst = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblSumNetto = New GrapeCity.ActiveReports.SectionReportModel.Label()
         Me.lblSumMenge = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblName1 = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblSumNet = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblSumVat = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.lblSumBrt = New GrapeCity.ActiveReports.SectionReportModel.Label()
-        Me.Label10 = New GrapeCity.ActiveReports.SectionReportModel.Label()
         CType(Me.Label8, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label14, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -63,6 +63,11 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         CType(Me.lblBrutto, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblNetto, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblMWST, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblName1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblSumNet, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblSumVat, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.lblSumBrt, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Label10, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Label28, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblDat, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -75,11 +80,6 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         CType(Me.lblSumMwst, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSumNetto, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.lblSumMenge, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblName1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblSumNet, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblSumVat, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.lblSumBrt, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.Label10, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
         '
         'PageHeader
@@ -243,6 +243,73 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         Me.lblMWST.Top = 0.2846457!
         Me.lblMWST.Width = 0.9169284!
         '
+        'lblName1
+        '
+        Me.lblName1.DataField = ""
+        Me.lblName1.Height = 0.1417323!
+        Me.lblName1.HyperLink = Nothing
+        Me.lblName1.Left = 0.8834646!
+        Me.lblName1.Name = "lblName1"
+        Me.lblName1.Padding = New GrapeCity.ActiveReports.PaddingEx(3, 0, 0, 0)
+        Me.lblName1.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; ddo-char-set" &
+    ": 1"
+        Me.lblName1.Text = "Name1"
+        Me.lblName1.Top = 0.05196851!
+        Me.lblName1.Width = 4.159056!
+        '
+        'lblSumNet
+        '
+        Me.lblSumNet.DataField = ""
+        Me.lblSumNet.Height = 0.1417323!
+        Me.lblSumNet.HyperLink = Nothing
+        Me.lblSumNet.Left = 5.123229!
+        Me.lblSumNet.Name = "lblSumNet"
+        Me.lblSumNet.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: right; ddo-char-set:" &
+    " 1"
+        Me.lblSumNet.Text = "Betrag"
+        Me.lblSumNet.Top = 0.5279528!
+        Me.lblSumNet.Width = 0.9169284!
+        '
+        'lblSumVat
+        '
+        Me.lblSumVat.DataField = ""
+        Me.lblSumVat.Height = 0.1417323!
+        Me.lblSumVat.HyperLink = Nothing
+        Me.lblSumVat.Left = 6.040158!
+        Me.lblSumVat.Name = "lblSumVat"
+        Me.lblSumVat.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: right; ddo-char-set:" &
+    " 1"
+        Me.lblSumVat.Text = "Betrag"
+        Me.lblSumVat.Top = 0.5279528!
+        Me.lblSumVat.Width = 0.9169284!
+        '
+        'lblSumBrt
+        '
+        Me.lblSumBrt.DataField = ""
+        Me.lblSumBrt.Height = 0.1417323!
+        Me.lblSumBrt.HyperLink = Nothing
+        Me.lblSumBrt.Left = 6.967323!
+        Me.lblSumBrt.Name = "lblSumBrt"
+        Me.lblSumBrt.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: right; ddo-char-set:" &
+    " 1"
+        Me.lblSumBrt.Text = "Betrag"
+        Me.lblSumBrt.Top = 0.5279528!
+        Me.lblSumBrt.Width = 0.9169284!
+        '
+        'Label10
+        '
+        Me.Label10.DataField = ""
+        Me.Label10.Height = 0.1417323!
+        Me.Label10.HyperLink = Nothing
+        Me.Label10.Left = 0.8834646!
+        Me.Label10.Name = "Label10"
+        Me.Label10.Padding = New GrapeCity.ActiveReports.PaddingEx(3, 0, 0, 0)
+        Me.Label10.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " &
+    "1"
+        Me.Label10.Text = "Summe"
+        Me.Label10.Top = 0.5279528!
+        Me.Label10.Width = 4.159056!
+        '
         'PageFooter
         '
         Me.PageFooter.Controls.AddRange(New GrapeCity.ActiveReports.SectionReportModel.ARControl() {Me.Label28, Me.Line2, Me.ReportInfo2, Me.lblDat})
@@ -438,73 +505,6 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         Me.lblSumMenge.Top = 0.1732284!
         Me.lblSumMenge.Width = 0.7917318!
         '
-        'lblName1
-        '
-        Me.lblName1.DataField = ""
-        Me.lblName1.Height = 0.1417323!
-        Me.lblName1.HyperLink = Nothing
-        Me.lblName1.Left = 0.8834646!
-        Me.lblName1.Name = "lblName1"
-        Me.lblName1.Padding = New GrapeCity.ActiveReports.PaddingEx(3, 0, 0, 0)
-        Me.lblName1.Style = "color: Black; font-size: 8pt; font-weight: normal; text-align: left; ddo-char-set" &
-    ": 1"
-        Me.lblName1.Text = "Name1"
-        Me.lblName1.Top = 0.05196851!
-        Me.lblName1.Width = 4.159056!
-        '
-        'lblSumNet
-        '
-        Me.lblSumNet.DataField = ""
-        Me.lblSumNet.Height = 0.1417323!
-        Me.lblSumNet.HyperLink = Nothing
-        Me.lblSumNet.Left = 5.123229!
-        Me.lblSumNet.Name = "lblSumNet"
-        Me.lblSumNet.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: right; ddo-char-set:" &
-    " 1"
-        Me.lblSumNet.Text = "Betrag"
-        Me.lblSumNet.Top = 0.5279528!
-        Me.lblSumNet.Width = 0.9169284!
-        '
-        'lblSumVat
-        '
-        Me.lblSumVat.DataField = ""
-        Me.lblSumVat.Height = 0.1417323!
-        Me.lblSumVat.HyperLink = Nothing
-        Me.lblSumVat.Left = 6.040158!
-        Me.lblSumVat.Name = "lblSumVat"
-        Me.lblSumVat.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: right; ddo-char-set:" &
-    " 1"
-        Me.lblSumVat.Text = "Betrag"
-        Me.lblSumVat.Top = 0.5279528!
-        Me.lblSumVat.Width = 0.9169284!
-        '
-        'lblSumBrt
-        '
-        Me.lblSumBrt.DataField = ""
-        Me.lblSumBrt.Height = 0.1417323!
-        Me.lblSumBrt.HyperLink = Nothing
-        Me.lblSumBrt.Left = 6.967323!
-        Me.lblSumBrt.Name = "lblSumBrt"
-        Me.lblSumBrt.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: right; ddo-char-set:" &
-    " 1"
-        Me.lblSumBrt.Text = "Betrag"
-        Me.lblSumBrt.Top = 0.5279528!
-        Me.lblSumBrt.Width = 0.9169284!
-        '
-        'Label10
-        '
-        Me.Label10.DataField = ""
-        Me.Label10.Height = 0.1417323!
-        Me.Label10.HyperLink = Nothing
-        Me.Label10.Left = 0.8834646!
-        Me.Label10.Name = "Label10"
-        Me.Label10.Padding = New GrapeCity.ActiveReports.PaddingEx(3, 0, 0, 0)
-        Me.Label10.Style = "color: Black; font-size: 8pt; font-weight: bold; text-align: left; ddo-char-set: " &
-    "1"
-        Me.Label10.Text = "Summe"
-        Me.Label10.Top = 0.5279528!
-        Me.Label10.Width = 4.159056!
-        '
         'rptASFINAG_TransaktionenSumary
         '
         Me.PageSettings.Margins.Bottom = 0.3937008!
@@ -535,6 +535,11 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         CType(Me.lblBrutto, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblNetto, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblMWST, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblName1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblSumNet, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblSumVat, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.lblSumBrt, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Label10, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Label28, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ReportInfo2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblDat, System.ComponentModel.ISupportInitialize).EndInit()
@@ -547,11 +552,6 @@ Partial Public Class rptASFINAG_TransaktionenSumary
         CType(Me.lblSumMwst, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSumNetto, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.lblSumMenge, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblName1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblSumNet, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblSumVat, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.lblSumBrt, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.Label10, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
 
     End Sub

SDL/mdm/rptASFINAG_TransaktionenSumary.vb

@@ -6,4 +6,7 @@ Public Class rptASFINAG_TransaktionenSumary
 
     End Sub
 
+    Private Sub PageFooter_Format(sender As Object, e As EventArgs) Handles PageFooter.Format
+
+    End Sub
 End Class

SDL/mdm/usrCntlMDMAuswertungen.vb

@@ -989,7 +989,8 @@ Public Class usrCntlMDMAuswertungen
                                                     dbo.CLFBody.RecordType,
                                                     dbo.CLFBody.fileNumber,
                                                     dbo.CLFBody.cardNumber,
-                                                    dbo.CLFBody.validTo	OBUID,
+                                                    dbo.CLFBody.validTo,	
+                                                    dbo.CLFBody.OBUID,
                                                     dbo.CLFBody.vehicleLicensePlate,
                                                     dbo.CLFBody.nationality,
                                                     dbo.CLFBody.vehicleCategory,

VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb

@@ -182,6 +182,29 @@ Public Class cAdressen
         Return False
     End Function
 
+    Function getUIDMehrfachverwendung() As Boolean
+
+        If If(UstIdKz, String.Empty) <> String.Empty And If(UstIdNr, String.Empty) <> String.Empty Then
+            Dim count As Integer = SQL.getValueTxtBySql("SELECT count(*)  FROM [Adressen] INNER JOIN Kunden ON KundenNr=AdressenNr WHERE [UstIdKz]='" & UstIdKz & "' AND [UstIdNr]='" & UstIdNr & "'", "FMZOLL")
+            If count > 0 Then
+                Return True
+            End If
+        End If
+        Return False
+
+    End Function
+
+    Function getDTUIDMehrfachverwendung(adressenNr) As DataTable
+        Dim dt_UID As New DataTable
+        If If(UstIdKz, String.Empty) <> String.Empty And If(UstIdNr, String.Empty) <> String.Empty Then
+
+            dt_UID = SQL.loadDgvBySql_Param("SELECT KundenNr FROM [Adressen] INNER JOIN Kunden ON KundenNr=AdressenNr WHERE [UstIdKz]='" & UstIdKz & "' AND [UstIdNr]='" & UstIdNr & "' and not KundenNr='" & adressenNr & "'", "FMZOLL")
+        End If
+
+        Return dt_UID
+
+    End Function
+
     Public Function SAVE(Optional newFlag = False) As Boolean 'obj As Object, tablename As String, where As String) As Boolean
         If newFlag Then INIT_NEWKD_DATA()
         If AdressenNr <= 0 Then

VERAG_PROG_ALLGEMEIN/Classes/cAsfinagMaut.vb

@@ -11,11 +11,13 @@ Public Class cAsfinagMaut
     Property VATamount As Object = Nothing
     Property totalAmount As Object = Nothing
     Property additionalData As Object = Nothing
+    Property receiptnumber As Object = Nothing
+    Property receiptCreated As Boolean = False
 
 
     Public hasEntry = False
 
-        Dim SQL As New SQL
+    Dim SQL As New SQL
 
     Sub New()
 
@@ -30,8 +32,10 @@ Public Class cAsfinagMaut
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("VATamount", VATamount))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("totalAmount", totalAmount))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("additionalData", additionalData))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("receiptnumber", receiptnumber))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("receiptCreated", receiptCreated))
         Return list
-        End Function
+    End Function
 
 
 
@@ -76,23 +80,24 @@ Public Class cAsfinagMaut
 
 
     Public Function getInsertCmd() As String
-            Try
+        Try
-                Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
+            Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
-                Dim str As String = ""
+            Dim str As String = ""
-                Dim values As String = ""
+            Dim values As String = ""
-                For Each i In list
+            For Each i In list
-                    If Not i.isPrimaryParam Then
+                If Not i.isPrimaryParam Then
-                        str &= "[" & i.Text & "],"
+                    str &= "[" & i.Text & "],"
-                        values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
+                    values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & ","
-                    End If
+                End If
-                Next
+            Next
-                str = str.Substring(0, str.Length - 1) 'wg. ','
+            str = str.Substring(0, str.Length - 1) 'wg. ','
-                values = values.Substring(0, values.Length - 1) 'wg. ','
+            values = values.Substring(0, values.Length - 1) 'wg. ','
             Return (" INSERT INTO tblAsfinagMaut  (" & str & ") VALUES(" & values & ")  ")
         Catch ex As Exception
-                VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
-            End Try
+        End Try
-            Return ""
+        Return ""
-        End Function
+    End Function
 
-    End Class
+
+End Class

VERAG_PROG_ALLGEMEIN/Classes/cUIDPruefung.vb

@@ -229,26 +229,27 @@ Public Class cUIDPruefung
                                     If UID_TMP.uid_valid Then
                                         r("Ergebnis") = "OK"
 
-                                        For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "'")
+                                        For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'")
                                             row("Ergebnis") = r("Ergebnis")
                                         Next
-
+                                        ' Bei ungültig soll er einzeln durchgehen! Besprochen mit A.Stockenhuber
                                     Else
                                         r("Ergebnis") = "UNGÜLTIG"
-                                        For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "'")
+                                        '    For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'")
-                                            row("Ergebnis") = r("Ergebnis")
+                                        '        row("Ergebnis") = r("Ergebnis")
-                                        Next
+                                        '    Next
                                     End If
                                 Else
                                     r("Ergebnis") = "ERROR"
                                     r("Error-Code") = errorCode.ToString()
                                     r("Error-Text") = FO.GetCodeText(errorCode)
 
-                                    For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "'")
+                                    ' Bei ERROR soll er ebenfalls einzeln durchgehen! Besprochen mit A.Stockenhuber
-                                        row("Ergebnis") = r("Ergebnis")
+                                    'For Each row As DataRow In dt.Select("UstIdnr = '" & r("UstIdnr") & "' AND UstIdKz ='" & r("UstIdKz") & "'")
-                                        row("Error-Code") = r("Error-Code")
+                                    '    row("Ergebnis") = r("Ergebnis")
-                                        row("Error-Text") = r("Error-Text")
+                                    '    row("Error-Code") = r("Error-Code")
-                                    Next
+                                    '    row("Error-Text") = r("Error-Text")
+                                    'Next
 
                                 End If
 

VERAG_PROG_ALLGEMEIN/Schnittstellen/BMD/cBMD_Interface.vb

@@ -226,7 +226,7 @@
 
     Shared Function getBuchungen(Firma_ID As Integer) As DataTable
 
-        Dim sqlStr = " SELECT TOP (1000) IVO.Rechnungsdatum,IVO.Rechnungsnummer,min(Speditionsbuch) as Speditionsbuch	,min(FilialenNr) as FilialenNr,min(AbfertigungsNr) as AbfertigungsNr,min(UnterNr) as UnterNr,min(Abfertigungsdatum) as Abfertigungsdatum,min(BelegartenNr) as BelegartenNr
+        Dim sqlStr = " SELECT IVO.Rechnungsdatum,IVO.Rechnungsnummer,min(Speditionsbuch) as Speditionsbuch	,min(FilialenNr) as FilialenNr,min(AbfertigungsNr) as AbfertigungsNr,min(UnterNr) as UnterNr,min(Abfertigungsdatum) as Abfertigungsdatum,min(BelegartenNr) as BelegartenNr
                         ,min(KundenNrZentrale) as [KundenNrZentrale],min(RechnungsKundenNr) as RechnungsKundenNr,min(RechnungsLandKz) as RechnungsLandKz,min(RechnungsUstIdKz) as RechnungsUstIdKz,min(RechnungsUstIdNr) as RechnungsUstIdNr
                         ,min(Lastschrift+0) as Lastschrift,min(Steuerschlüssel) as Steuerschlüssel,min([Steuersatz %]) as Steuersatz,min(WährungLokal) as WährungLokal,min(SteuerbetragLokal) as SteuerbetragLokal,min(RechnungsbetragLokal) as RechnungsbetragLokal
                         ,min(WährungFremd) as WährungFremd,min(SteuerbetragFremd) as SteuerbetragFremd,min(RechnungsbetragFremd) as RechnungsbetragFremd,min(TrdinDateiname) as TrdinDateiname,min(Abgleich_op_debitor+0) as Abgleich_op_debitor

VERAG_PROG_ALLGEMEIN/Schnittstellen/Finanzonline/cFinanzOnlineWebService.vb

@@ -91,10 +91,13 @@ Public Class cFinanzOnlineWebService
 
     Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ba_KundenNr, Optional AskIfDouble = False, Optional SaveErgInAdressen = True, Optional showErr = True, Optional Stufe = 1, Optional ByRef errorCode = 0) As VERAG_PROG_ALLGEMEIN.cUIDPruefung
         Dim AD As New cAdressen(ba_KundenNr)
+        Dim multiUID = False
         If AD IsNot Nothing Then
 
             If AD.UstIdKz IsNot Nothing AndAlso AD.UstIdNr IsNot Nothing Then
 
+
+
                 Try
                     If AskIfDouble Then
                         If IsDate(AD.UstIdGeprüft) AndAlso CDate(AD.UstIdGeprüft).ToShortDateString = Now.ToShortDateString Then
@@ -131,6 +134,8 @@ Public Class cFinanzOnlineWebService
 
                     If returnInt = 0 Or returnInt = 1 Then
 
+                        If Stufe = 1 AndAlso returnInt = 0 Then multiUID = AD.getUIDMehrfachverwendung() 'nur bei Stufe 1 und bei gültigen Prüfungen!!!
+
                         Dim UID_TMP As New VERAG_PROG_ALLGEMEIN.cUIDPruefung
 
                         UID_TMP.uid_Datum = Now
@@ -140,7 +145,6 @@ Public Class cFinanzOnlineWebService
                         UID_TMP.uid_valid = (returnInt = 0)
                         UID_TMP.uid_KundenNr = ba_KundenNr
 
-
                         UID_TMP.uid_UstIdKz = countryCode
                         UID_TMP.uid_UstIdNr = vatNumber
 
@@ -159,7 +163,56 @@ Public Class cFinanzOnlineWebService
                         UID_TMP.uid_stufe = Stufe
 
                         UID_TMP.SAVE()
-                        If (returnInt = 0) Then 'OK
+
+                        If multiUID Then
+                            Dim dt_multiUID As DataTable = AD.getDTUIDMehrfachverwendung(AD.AdressenNr)
+                            If dt_multiUID.Rows.Count > 0 Then
+                                For Each adresse As DataRow In dt_multiUID.Rows
+
+                                    Dim UID_TMP_new As New VERAG_PROG_ALLGEMEIN.cUIDPruefung
+                                    Dim AD_new As New cAdressen(adresse.Item("KundenNr"))
+
+                                    UID_TMP_new.uid_Datum = Now
+                                    UID_TMP_new.uid_Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+                                    If If(UID_TMP_new.uid_Sachbearbeiter, "") = "" Then UID_TMP_new.uid_Sachbearbeiter = "AUTO"
+                                    UID_TMP_new.uid_MaId = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID
+                                    UID_TMP_new.uid_valid = (returnInt = 0)
+                                    UID_TMP_new.uid_KundenNr = AD_new.AdressenNr
+
+
+                                    UID_TMP_new.uid_UstIdKz = countryCode
+                                    UID_TMP_new.uid_UstIdNr = vatNumber
+
+                                    UID_TMP_new.Firma = If(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, "VERAG")
+                                    UID_TMP_new.uid_abfrageUid = uid
+                                    UID_TMP_new.uid_sessionId = tmp_SESSION_ID
+
+                                    UID_TMP_new.uid_firma = name
+                                    UID_TMP_new.uid_adr1 = adrz1
+                                    UID_TMP_new.uid_adr2 = adrz2
+                                    UID_TMP_new.uid_adr3 = adrz3
+                                    UID_TMP_new.uid_adr4 = adrz4
+                                    UID_TMP_new.uid_adr5 = adrz5
+                                    UID_TMP_new.uid_adr6 = adrz6
+
+                                    UID_TMP_new.uid_stufe = Stufe
+
+                                    UID_TMP_new.SAVE()
+
+                                    If (UID_TMP.uid_valid) Then 'OK
+                                        If SaveErgInAdressen Then
+                                            AD_new.UstIdGeprüft = Now.ToShortDateString
+                                            AD_new.SAVE()
+                                        End If
+                                    End If
+
+                                Next
+
+                            End If
+
+                        End If
+
+                            If (returnInt = 0) Then 'OK
                             If SaveErgInAdressen Then
                                 AD.UstIdGeprüft = Now.ToShortDateString
                                 AD.SAVE()

VERAG_PROG_ALLGEMEIN/Schnittstellen/cDVO_Interface.vb

@@ -259,7 +259,7 @@
 
     Shared Function getBuchungen(Firma_ID As Integer) As DataTable
 
-        Dim sqlStr = " SELECT TOP (1000) IVO.Rechnungsdatum,IVO.Rechnungsnummer,min(Speditionsbuch) as Speditionsbuch	,min(FilialenNr) as FilialenNr,min(AbfertigungsNr) as AbfertigungsNr,min(UnterNr) as UnterNr,min(Abfertigungsdatum) as Abfertigungsdatum,min(BelegartenNr) as BelegartenNr
+        Dim sqlStr = " SELECT IVO.Rechnungsdatum,IVO.Rechnungsnummer,min(Speditionsbuch) as Speditionsbuch	,min(FilialenNr) as FilialenNr,min(AbfertigungsNr) as AbfertigungsNr,min(UnterNr) as UnterNr,min(Abfertigungsdatum) as Abfertigungsdatum,min(BelegartenNr) as BelegartenNr
                         ,min(KundenNrZentrale) as [KundenNrZentrale],min(RechnungsKundenNr) as RechnungsKundenNr,min(RechnungsLandKz) as RechnungsLandKz,min(RechnungsUstIdKz) as RechnungsUstIdKz,min(RechnungsUstIdNr) as RechnungsUstIdNr
                         ,min(Lastschrift+0) as Lastschrift,min(Steuerschlüssel) as Steuerschlüssel,min([Steuersatz %]) as Steuersatz,min(WährungLokal) as WährungLokal,min(SteuerbetragLokal) as SteuerbetragLokal,min(RechnungsbetragLokal) as RechnungsbetragLokal
                         ,min(WährungFremd) as WährungFremd,min(SteuerbetragFremd) as SteuerbetragFremd,min(RechnungsbetragFremd) as RechnungsbetragFremd,min(TrdinDateiname) as TrdinDateiname,min(Abgleich_op_debitor+0) as Abgleich_op_debitor

VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb

@@ -12,7 +12,7 @@
 
     'STAMMDATEN
     Shared Function getStammdaten(filialNr As Integer) As DataTable
-        Dim sqlStr = "Select top (200) right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ,  isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse],  isnull(Adressen.landkz,'') as [Länderkennzeichen]"
+        Dim sqlStr = "Select right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ,  isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse],  isnull(Adressen.landkz,'') as [Länderkennzeichen]"
         sqlStr &= " FROM Adressen INNER JOIN Kunden ON Kundennr=AdressenNr  "
         sqlStr &= " LEFT JOIN tblKundenErweitert ON KundenNr=kde_KundenNr "
         sqlStr &= " LEFT JOIN [Länderverzeichnis für die Außenhandelsstatistik] as St ON St.LandKz=Adressen.LandKz "
@@ -278,7 +278,7 @@
 
     Shared Function getBuchungen(Firma_ID As Integer) As DataTable
 
-        Dim sqlStr = " SELECT TOP (1000) IVO.Rechnungsdatum,IVO.Rechnungsnummer,min(Speditionsbuch) as Speditionsbuch	,min(FilialenNr) as FilialenNr,min(AbfertigungsNr) as AbfertigungsNr,min(UnterNr) as UnterNr,min(Abfertigungsdatum) as Abfertigungsdatum,min(BelegartenNr) as BelegartenNr
+        Dim sqlStr = " SELECT IVO.Rechnungsdatum,IVO.Rechnungsnummer,min(Speditionsbuch) as Speditionsbuch	,min(FilialenNr) as FilialenNr,min(AbfertigungsNr) as AbfertigungsNr,min(UnterNr) as UnterNr,min(Abfertigungsdatum) as Abfertigungsdatum,min(BelegartenNr) as BelegartenNr
                         ,min(KundenNrZentrale) as [KundenNrZentrale],min(RechnungsKundenNr) as RechnungsKundenNr,min(RechnungsLandKz) as RechnungsLandKz,min(RechnungsUstIdKz) as RechnungsUstIdKz,min(RechnungsUstIdNr) as RechnungsUstIdNr
                         ,min(Lastschrift+0) as Lastschrift,min(Steuerschlüssel) as Steuerschlüssel,min([Steuersatz %]) as Steuersatz,min(WährungLokal) as WährungLokal,min(SteuerbetragLokal) as SteuerbetragLokal,min(RechnungsbetragLokal) as RechnungsbetragLokal
                         ,min(WährungFremd) as WährungFremd,min(SteuerbetragFremd) as SteuerbetragFremd,min(RechnungsbetragFremd) as RechnungsbetragFremd,min(TrdinDateiname) as TrdinDateiname,min(Abgleich_op_debitor+0) as Abgleich_op_debitor

VERAG_PROG_ALLGEMEIN/Schnittstellen/cSyska_Interface.vb

@@ -504,7 +504,7 @@ Public Class cSyska_Interface
     End Function
     Shared Function getBuchungen(Firma_ID As Integer, Optional WdhDateiname As String = "") As DataTable
 
-        Dim sqlStr = " SELECT TOP (1000) IVO.Rechnungsdatum,IVO.Rechnungsnummer,min(Speditionsbuch) as Speditionsbuch	,min(FilialenNr) as FilialenNr,min(AbfertigungsNr) as AbfertigungsNr,min(UnterNr) as UnterNr,min(Abfertigungsdatum) as Abfertigungsdatum,min(BelegartenNr) as BelegartenNr
+        Dim sqlStr = " SELECT IVO.Rechnungsdatum,IVO.Rechnungsnummer,min(Speditionsbuch) as Speditionsbuch	,min(FilialenNr) as FilialenNr,min(AbfertigungsNr) as AbfertigungsNr,min(UnterNr) as UnterNr,min(Abfertigungsdatum) as Abfertigungsdatum,min(BelegartenNr) as BelegartenNr
                         ,min(KundenNrZentrale) as [KundenNrZentrale],min(RechnungsKundenNr) as RechnungsKundenNr,min(RechnungsLandKz) as RechnungsLandKz,min(RechnungsUstIdKz) as RechnungsUstIdKz,min(RechnungsUstIdNr) as RechnungsUstIdNr
                         ,min(Lastschrift+0) as Lastschrift,min(Steuerschlüssel) as Steuerschlüssel,min([Steuersatz %]) as Steuersatz,min(WährungLokal) as WährungLokal,min(SteuerbetragLokal) as SteuerbetragLokal,min(RechnungsbetragLokal) as RechnungsbetragLokal
                         ,min(WährungFremd) as WährungFremd,min(SteuerbetragFremd) as SteuerbetragFremd,min(RechnungsbetragFremd) as RechnungsbetragFremd,min(TrdinDateiname) as TrdinDateiname,min(Abgleich_op_debitor+0) as Abgleich_op_debitor

VERAG_PROG_ALLGEMEIN/cProgramFunktions.vb

@@ -4,6 +4,7 @@ Imports System.Net.Mail
 Imports System.Text
 Imports System.Windows.Forms
 Imports ClosedXML.Excel
+Imports Microsoft.Office.Interop
 
 Public Class cProgramFunctions
 
@@ -380,7 +381,9 @@ Public Class cProgramFunctions
 
         Try
             'SENDEN::::::::::::::::::::::
-            mySmtpsvr.Send(Msg)
+            Dim mailItem As Outlook.MailItem = TryCast(Msg, Outlook.MailItem)
+            mailItem.Display()
+            'mySmtpsvr.Send(Msg)
 
         Catch ex As Exception
             Try 'Falls Fehler nicht beim Senden, sonder was anderes.