Fakturierung Prüfung bereits fakt.; EUST separieren; Spire PDF

2023-07-18 09:26:21 +02:00
parent d0657deda8
commit 2c562c6adb
13 changed files with 434 additions and 291 deletions
--- a/SDL/Fakturierung/cFakturierung.vb
+++ b/SDL/Fakturierung/cFakturierung.vb
@@ -1652,6 +1652,12 @@ Public Class cFakturierung
    Shared Function Abrechnugsdaten_AKTUALISIEREN(ByRef RECHNUNG As VERAG_PROG_ALLGEMEIN.cRechnungsausgang, Optional RechnungsDatum As Object = Nothing) As Boolean
        RECHNUNG.[DruckDatumZeit] = Now

+        If RECHNUNG.checkAlreadyPrinted Then
+            'Rechnung wurde bereits gedruck - evtl. bei überschneidenden Rechnungslauf --> Druck abbrechen!
+            MsgBox("Die Rechnung '" & RECHNUNG.FilialenNr & "/" & RECHNUNG.AbfertigungsNr & "' an '" & RECHNUNG.RechnungsName_1 & "' wurde bereits gedruckt!")
+            Return False
+        End If
+

        If RECHNUNG.Sammelrechnung = 0 Then
            ' Rechnungsdaten im RK eintragen.
--- a/SDL/Fakturierung/frmAbrechnungsMaske.vb
+++ b/SDL/Fakturierung/frmAbrechnungsMaske.vb
@@ -262,6 +262,7 @@ Public Class frmAbrechnungsMaske

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
        If checkSrchValues() Then
+            getDGV().RELOAD()
            Dim orderBy = ""
            Select Case cboSort._value
                Case "EZ" : orderBy = " ORDER BY [ReErfZeitstempel] ASC"
@@ -353,6 +354,7 @@ Public Class frmAbrechnungsMaske

    Private Sub Button9_Click(sender As Object, e As EventArgs) Handles Button9.Click
        If dgvRechnungen.SelectedRows.Count > 0 Then
+            '  getDGV().RELOAD() -> hebt Selektierung auf
            If vbYes = MsgBox("Es werden " & dgvRechnungen.SelectedRows.Count & " Rechnungen in ein PDF gewandelt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then

                'Rechnungsdatum festlegen:
@@ -389,6 +391,7 @@ Public Class frmAbrechnungsMaske
    End Sub

    Private Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click, Button11.Click
+        '  getDGV().RELOAD() -> hebt Selektierung auf
        For Each r As DataGridViewRow In dgvRechnungen.SelectedRows
            If r.Cells("Art").Value <> "0" Then
                MsgBox("Nur bei Einzelrechnung")
@@ -524,6 +527,7 @@ Public Class frmAbrechnungsMaske

    Private Sub Button7_Click2(sender As Object, e As EventArgs) Handles Button7.Click
        If dgvRechnungen.SelectedRows.Count > 0 Then
+            '  getDGV().RELOAD() -> hebt Selektierung auf
            If vbYes = MsgBox("Es werden " & dgvRechnungen.SelectedRows.Count & " Rechnungen gedruckt." & vbNewLine & "Möchten Sie fortfahren?", vbYesNoCancel) Then

                'Rechnungsdatum festlegen:
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.Designer.vb
@@ -23,27 +23,27 @@ Partial Class usrCntlFaktAbrechnung
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle27 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle32 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle33 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle28 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle29 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle30 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle31 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle34 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle35 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle36 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle37 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle38 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle39 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle40 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle41 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle42 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlFaktAbrechnung))
        Me.Label9 = New System.Windows.Forms.Label()
        Me.Label4 = New System.Windows.Forms.Label()
@@ -234,7 +234,6 @@ Partial Class usrCntlFaktAbrechnung
        Me.lblEUR_4 = New System.Windows.Forms.Label()
        Me.Label55 = New System.Windows.Forms.Label()
        Me.cboSteuerschlüssel = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten()
        Me.cbxOriginalPrint = New System.Windows.Forms.CheckBox()
        Me.Label46 = New System.Windows.Forms.Label()
        Me.Button9 = New System.Windows.Forms.Button()
@@ -271,6 +270,10 @@ Partial Class usrCntlFaktAbrechnung
        Me.EmpfängerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AuftraggeberToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AvisiererToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.GutschriftAusRechnungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.SeperateRechnungFürEUSTToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.rtbAbf_Besonderheiten = New SDL.usrCntlKundenBesonderheiten()
        Me.pnlTop.SuspendLayout()
        Me.Panel3.SuspendLayout()
        Me.Panel1.SuspendLayout()
@@ -295,6 +298,7 @@ Partial Class usrCntlFaktAbrechnung
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.CntxtAbfArt.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
+        Me.ContextMenuStrip2.SuspendLayout()
        Me.SuspendLayout()
        '
        'Label9
@@ -405,7 +409,7 @@ Partial Class usrCntlFaktAbrechnung
        Me.Button11.Name = "Button11"
        Me.Button11.Size = New System.Drawing.Size(107, 24)
        Me.Button11.TabIndex = 20
-        Me.Button11.Text = "Gutschrift aus RG"
+        Me.Button11.Text = "Optionen"
        Me.Button11.UseVisualStyleBackColor = True
        '
        'lblDruckaufheben
@@ -859,36 +863,36 @@ Partial Class usrCntlFaktAbrechnung
        Me.dgvAnhaenge.AllowUserToResizeColumns = False
        Me.dgvAnhaenge.AllowUserToResizeRows = False
        Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle22
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvAnhaenge.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
        Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvAnhaenge.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.optAnhSel, Me.DataGridViewTextBoxColumn2, Me.clmnBezeichnung, Me.clmnDsId, Me.clmnAnhId})
-        DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle25
+        DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvAnhaenge.DefaultCellStyle = DataGridViewCellStyle4
        Me.dgvAnhaenge.Location = New System.Drawing.Point(493, 911)
        Me.dgvAnhaenge.MultiSelect = False
        Me.dgvAnhaenge.Name = "dgvAnhaenge"
        Me.dgvAnhaenge.ReadOnly = True
-        DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle26
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvAnhaenge.RowHeadersDefaultCellStyle = DataGridViewCellStyle5
        Me.dgvAnhaenge.RowHeadersVisible = False
        Me.dgvAnhaenge.RowHeadersWidth = 62
        Me.dgvAnhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -910,10 +914,10 @@ Partial Class usrCntlFaktAbrechnung
        '
        'DataGridViewTextBoxColumn2
        '
-        DataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle23.Format = "N0"
-        DataGridViewCellStyle23.NullValue = Nothing
-        Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle23
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle2.Format = "N0"
+        DataGridViewCellStyle2.NullValue = Nothing
+        Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle2
        Me.DataGridViewTextBoxColumn2.HeaderText = "Art"
        Me.DataGridViewTextBoxColumn2.MinimumWidth = 8
        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
@@ -923,9 +927,9 @@ Partial Class usrCntlFaktAbrechnung
        'clmnBezeichnung
        '
        Me.clmnBezeichnung.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        DataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle24.Format = "c2"
-        Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle24
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.Format = "c2"
+        Me.clmnBezeichnung.DefaultCellStyle = DataGridViewCellStyle3
        Me.clmnBezeichnung.FillWeight = 121.2598!
        Me.clmnBezeichnung.HeaderText = "Bezeichnung"
        Me.clmnBezeichnung.MinimumWidth = 8
@@ -2856,35 +2860,35 @@ Partial Class usrCntlFaktAbrechnung
        Me.dgvRechnungenPositionen.AllowUserToResizeColumns = False
        Me.dgvRechnungenPositionen.AllowUserToResizeRows = False
        Me.dgvRechnungenPositionen.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle27
+        DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvRechnungenPositionen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6
        Me.dgvRechnungenPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvRechnungenPositionen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.Leistung, Me.Anzahl, Me.Preis, Me.SteuerpflichtigerBetrag, Me.SteuerfreierBetrag, Me.Aufschubkonto})
-        DataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle32.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle32
+        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvRechnungenPositionen.DefaultCellStyle = DataGridViewCellStyle11
        Me.dgvRechnungenPositionen.Location = New System.Drawing.Point(10, 258)
        Me.dgvRechnungenPositionen.Name = "dgvRechnungenPositionen"
        Me.dgvRechnungenPositionen.ReadOnly = True
-        DataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle33
+        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvRechnungenPositionen.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
        Me.dgvRechnungenPositionen.RowHeadersVisible = False
        Me.dgvRechnungenPositionen.RowHeadersWidth = 62
        Me.dgvRechnungenPositionen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
@@ -2902,10 +2906,10 @@ Partial Class usrCntlFaktAbrechnung
        '
        'Anzahl
        '
-        DataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle28.Format = "N0"
-        DataGridViewCellStyle28.NullValue = Nothing
-        Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle28
+        DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle7.Format = "N0"
+        DataGridViewCellStyle7.NullValue = Nothing
+        Me.Anzahl.DefaultCellStyle = DataGridViewCellStyle7
        Me.Anzahl.HeaderText = "Anzahl"
        Me.Anzahl.MinimumWidth = 8
        Me.Anzahl.Name = "Anzahl"
@@ -2914,9 +2918,9 @@ Partial Class usrCntlFaktAbrechnung
        '
        'Preis
        '
-        DataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle29.Format = "c2"
-        Me.Preis.DefaultCellStyle = DataGridViewCellStyle29
+        DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle8.Format = "c2"
+        Me.Preis.DefaultCellStyle = DataGridViewCellStyle8
        Me.Preis.HeaderText = "Preis"
        Me.Preis.MinimumWidth = 8
        Me.Preis.Name = "Preis"
@@ -2925,9 +2929,9 @@ Partial Class usrCntlFaktAbrechnung
        '
        'SteuerpflichtigerBetrag
        '
-        DataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle30.Format = "c2"
-        Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle30
+        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle9.Format = "c2"
+        Me.SteuerpflichtigerBetrag.DefaultCellStyle = DataGridViewCellStyle9
        Me.SteuerpflichtigerBetrag.HeaderText = "Steuerpfl."
        Me.SteuerpflichtigerBetrag.MinimumWidth = 8
        Me.SteuerpflichtigerBetrag.Name = "SteuerpflichtigerBetrag"
@@ -2936,10 +2940,10 @@ Partial Class usrCntlFaktAbrechnung
        '
        'SteuerfreierBetrag
        '
-        DataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
-        DataGridViewCellStyle31.Format = "C2"
-        DataGridViewCellStyle31.NullValue = Nothing
-        Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle31
+        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight
+        DataGridViewCellStyle10.Format = "C2"
+        DataGridViewCellStyle10.NullValue = Nothing
+        Me.SteuerfreierBetrag.DefaultCellStyle = DataGridViewCellStyle10
        Me.SteuerfreierBetrag.HeaderText = "Steuerfrei"
        Me.SteuerfreierBetrag.MinimumWidth = 8
        Me.SteuerfreierBetrag.Name = "SteuerfreierBetrag"
@@ -2962,41 +2966,41 @@ Partial Class usrCntlFaktAbrechnung
        Me.dgvOffertenSperrliste.AllowUserToResizeRows = False
        Me.dgvOffertenSperrliste.BackgroundColor = System.Drawing.Color.White
        Me.dgvOffertenSperrliste.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        DataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle34
+        DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvOffertenSperrliste.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13
        Me.dgvOffertenSperrliste.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle35.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle35
+        DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvOffertenSperrliste.DefaultCellStyle = DataGridViewCellStyle14
        Me.dgvOffertenSperrliste.Location = New System.Drawing.Point(11, 29)
        Me.dgvOffertenSperrliste.MultiSelect = False
        Me.dgvOffertenSperrliste.Name = "dgvOffertenSperrliste"
        Me.dgvOffertenSperrliste.ReadOnly = True
-        DataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle36.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle36
+        DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvOffertenSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle15
        Me.dgvOffertenSperrliste.RowHeadersVisible = False
        Me.dgvOffertenSperrliste.RowHeadersWidth = 62
-        DataGridViewCellStyle37.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle37.SelectionBackColor = System.Drawing.Color.PapayaWhip
-        DataGridViewCellStyle37.SelectionForeColor = System.Drawing.Color.Black
-        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle37
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.PapayaWhip
+        DataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black
+        Me.dgvOffertenSperrliste.RowsDefaultCellStyle = DataGridViewCellStyle16
        Me.dgvOffertenSperrliste.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvOffertenSperrliste.Size = New System.Drawing.Size(204, 201)
        Me.dgvOffertenSperrliste.TabIndex = 2
@@ -3009,44 +3013,44 @@ Partial Class usrCntlFaktAbrechnung
        Me.dgvOfferteDetailsUebersicht.AllowUserToDeleteRows = False
        Me.dgvOfferteDetailsUebersicht.AllowUserToOrderColumns = True
        Me.dgvOfferteDetailsUebersicht.AllowUserToResizeRows = False
-        DataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
-        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle38
+        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.dgvOfferteDetailsUebersicht.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
        Me.dgvOfferteDetailsUebersicht.BackgroundColor = System.Drawing.Color.White
        Me.dgvOfferteDetailsUebersicht.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        DataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle39.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle39
+        DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvOfferteDetailsUebersicht.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle18
        Me.dgvOfferteDetailsUebersicht.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle40.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle40.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle40
+        DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvOfferteDetailsUebersicht.DefaultCellStyle = DataGridViewCellStyle19
        Me.dgvOfferteDetailsUebersicht.Location = New System.Drawing.Point(220, 29)
        Me.dgvOfferteDetailsUebersicht.MultiSelect = False
        Me.dgvOfferteDetailsUebersicht.Name = "dgvOfferteDetailsUebersicht"
-        DataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle41.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle41
+        DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvOfferteDetailsUebersicht.RowHeadersDefaultCellStyle = DataGridViewCellStyle20
        Me.dgvOfferteDetailsUebersicht.RowHeadersVisible = False
        Me.dgvOfferteDetailsUebersicht.RowHeadersWidth = 62
-        DataGridViewCellStyle42.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
-        DataGridViewCellStyle42.SelectionForeColor = System.Drawing.Color.Black
-        Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle42
+        DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
+        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black
+        Me.dgvOfferteDetailsUebersicht.RowsDefaultCellStyle = DataGridViewCellStyle21
        Me.dgvOfferteDetailsUebersicht.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvOfferteDetailsUebersicht.Size = New System.Drawing.Size(601, 201)
        Me.dgvOfferteDetailsUebersicht.TabIndex = 3
@@ -3433,17 +3437,6 @@ Partial Class usrCntlFaktAbrechnung
        Me.cboSteuerschlüssel.Size = New System.Drawing.Size(145, 21)
        Me.cboSteuerschlüssel.TabIndex = 3
        '
-        'rtbAbf_Besonderheiten
-        '
-        Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White
-        Me.rtbAbf_Besonderheiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.rtbAbf_Besonderheiten.Location = New System.Drawing.Point(10, 19)
-        Me.rtbAbf_Besonderheiten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.rtbAbf_Besonderheiten.Name = "rtbAbf_Besonderheiten"
-        Me.rtbAbf_Besonderheiten.Size = New System.Drawing.Size(107, 133)
-        Me.rtbAbf_Besonderheiten.TabIndex = 235
-        Me.rtbAbf_Besonderheiten.Visible = False
-        '
        'cbxOriginalPrint
        '
        Me.cbxOriginalPrint.AutoSize = True
@@ -3881,6 +3874,35 @@ Partial Class usrCntlFaktAbrechnung
        Me.AvisiererToolStripMenuItem.Size = New System.Drawing.Size(153, 22)
        Me.AvisiererToolStripMenuItem.Text = "4 Avisierer"
        '
+        'ContextMenuStrip2
+        '
+        Me.ContextMenuStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GutschriftAusRechnungToolStripMenuItem, Me.SeperateRechnungFürEUSTToolStripMenuItem})
+        Me.ContextMenuStrip2.Name = "ContextMenuStrip2"
+        Me.ContextMenuStrip2.Size = New System.Drawing.Size(224, 48)
+        '
+        'GutschriftAusRechnungToolStripMenuItem
+        '
+        Me.GutschriftAusRechnungToolStripMenuItem.Name = "GutschriftAusRechnungToolStripMenuItem"
+        Me.GutschriftAusRechnungToolStripMenuItem.Size = New System.Drawing.Size(223, 22)
+        Me.GutschriftAusRechnungToolStripMenuItem.Text = "Gutschrift aus Rechnung"
+        '
+        'SeperateRechnungFürEUSTToolStripMenuItem
+        '
+        Me.SeperateRechnungFürEUSTToolStripMenuItem.Name = "SeperateRechnungFürEUSTToolStripMenuItem"
+        Me.SeperateRechnungFürEUSTToolStripMenuItem.Size = New System.Drawing.Size(223, 22)
+        Me.SeperateRechnungFürEUSTToolStripMenuItem.Text = "Seperate Rechnung für EUST"
+        '
+        'rtbAbf_Besonderheiten
+        '
+        Me.rtbAbf_Besonderheiten.BackColor = System.Drawing.Color.White
+        Me.rtbAbf_Besonderheiten.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.rtbAbf_Besonderheiten.Location = New System.Drawing.Point(10, 19)
+        Me.rtbAbf_Besonderheiten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.rtbAbf_Besonderheiten.Name = "rtbAbf_Besonderheiten"
+        Me.rtbAbf_Besonderheiten.Size = New System.Drawing.Size(107, 133)
+        Me.rtbAbf_Besonderheiten.TabIndex = 235
+        Me.rtbAbf_Besonderheiten.Visible = False
+        '
        'usrCntlFaktAbrechnung
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -3927,6 +3949,7 @@ Partial Class usrCntlFaktAbrechnung
        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
        Me.CntxtAbfArt.ResumeLayout(False)
        Me.ContextMenuStrip1.ResumeLayout(False)
+        Me.ContextMenuStrip2.ResumeLayout(False)
        Me.ResumeLayout(False)

    End Sub
@@ -4156,4 +4179,7 @@ Partial Class usrCntlFaktAbrechnung
    Friend WithEvents AvisiererToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents txtTextZZ As VERAG_PROG_ALLGEMEIN.MyRichTextBox
    Friend WithEvents Button16 As Button
+    Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
+    Friend WithEvents GutschriftAusRechnungToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents SeperateRechnungFürEUSTToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.resx
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.resx
@@ -187,6 +187,9 @@
  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>343, 15</value>
  </metadata>
+  <metadata name="ContextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>500, 15</value>
+  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>45</value>
  </metadata>
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -82,11 +82,12 @@ Public Class usrCntlFaktAbrechnung
        vorherige_RK_ID = 0
        nachstehende_RK_ID = 0

-        Dim dt As DataTable = SQL.loadDgvBySql("SELECT UnterNr,RK_ID FROM Rechnungsausgang WHERE FilialenNr='" & RECHNUNG.FilialenNr & "' AND AbfertigungsNr='" & RECHNUNG.AbfertigungsNr & "' ", "FMZOLL")
+        Dim dt As DataTable = SQL.loadDgvBySql("SELECT UnterNr,RK_ID FROM Rechnungsausgang WHERE FilialenNr='" & RECHNUNG.FilialenNr & "' AND AbfertigungsNr='" & RECHNUNG.AbfertigungsNr & "' order by UnterNr", "FMZOLL")
        If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
            Dim anzahlRg = dt.Rows.Count
            Dim cnt = 1
            Dim exitSub = False
+            Dim found = False
            For Each r In dt.Rows
                If exitSub Then
                    nachstehende_RK_ID = r("RK_ID")
@@ -98,14 +99,17 @@ Public Class usrCntlFaktAbrechnung
                If r("UnterNr") = RECHNUNG.UnterNr Then

                    lblSendungen.Text = cnt & "/" & anzahlRg
-
+                    found = True
                    exitSub = True
-                End If
+                Else
                    If Not exitSub Then vorherige_RK_ID = r("RK_ID")
+
+                End If
                cnt += 1
            Next
-            If exitSub Then Exit Sub
-            lblSendungen.Text = "-/" & anzahlRg
+            'If exitSub Then Exit Sub
+            If Not found Then lblSendungen.Text = "-/" & anzahlRg : Exit Sub
+
        Else
            lblSendungen.Text = "-"
        End If
@@ -3345,6 +3349,10 @@ Nächste_Textzeile_lesen:
    End Sub

    Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click
+        ContextMenuStrip2.Show(Cursor.Position)
+    End Sub
+
+    Private Sub GutschriftAusRechnungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GutschriftAusRechnungToolStripMenuItem.Click
        If vbYes = MsgBox("Soll aus den Daten der Rechnung wirklich eine neue Gutschrift erstellt werden?", vbYesNoCancel) Then

            saveMe()
@@ -3741,5 +3749,79 @@ Nächste_Textzeile_lesen:
        End If
    End Sub

+    Private Sub SeperateRechnungFürEUSTToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SeperateRechnungFürEUSTToolStripMenuItem.Click
+        If vbYes = MsgBox("Soll aus der Rechnung wirklich eine seperate EUST Rechnung erstellt werden?", vbYesNoCancel) Then

+            saveMe()
+            Dim RECHNUNG_TMP_RKID = RECHNUNG.RK_ID
+
+
+            '--------------------------------------------------------------------------------------------
+
+            'Dim RECHNUNG2 = RECHNUNG
+            RECHNUNG.RK_ID = -1
+            RECHNUNG.RechnungsNr = -1
+            'RECHNUNG.RechnungsNr = Nothing
+            RECHNUNG.UnterNr = RECHNUNG.getMaxRGUnterNr()
+            RECHNUNG.RechnungsDatum = Nothing
+            RECHNUNG.DruckDatumZeit = Nothing
+            RECHNUNG.Status = 0
+            RECHNUNG.Trdin = 0
+            RECHNUNG.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+
+            dgvOfferteDetailsUebersicht.Columns.Clear()
+
+            '  initDGVRechnungenPositionen()
+
+            przBerechneRAPos("")
+            loadFormRGPosInOfferte()
+            initDGVRechnungenPositionen()
+            cboFiliale.Focus()
+
+            '--------------------------------------------------------------------------------------------
+            If Not saveMe() Then Exit Sub 'neue EUST-Rg speichern
+            Dim REM_POS_TMP As New List(Of VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen)
+            'EUST aus alter Rg entfernen
+            Dim RECHNUNG_TMP = New VERAG_PROG_ALLGEMEIN.cRechnungsausgang(RECHNUNG_TMP_RKID)
+            RECHNUNG_TMP.Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+            'RECHNUNG_TMP.SteuerfreierGesamtbetrag
+            For Each POS In RECHNUNG_TMP.POSITIONEN
+                Select Case POS.LeistungsNr
+                    Case "20", "77"
+                        REM_POS_TMP.Add(POS)
+                End Select
+            Next
+            For Each R_POS In REM_POS_TMP
+                RECHNUNG_TMP.POSITIONEN.Remove(R_POS)
+            Next
+
+            initDGVRechnungenPositionen()
+            ' RECHNUNG_TMP.SAVE_POSITIONEN(RECHNUNG_TMP.RK_ID)
+            saveMe()
+
+
+            '--------------------------------------------------------------------------------------------
+
+            'alles außer EUST aus neuer Rg entfernen
+            Dim REM_POS As New List(Of VERAG_PROG_ALLGEMEIN.cRechnungsausgangPositionen)
+            For Each POS In RECHNUNG.POSITIONEN
+                Select Case POS.LeistungsNr
+                    Case "20", "77"
+                    Case Else
+                        REM_POS.Add(POS)
+                End Select
+            Next
+            For Each R_POS In REM_POS
+                RECHNUNG.POSITIONEN.Remove(R_POS)
+            Next
+            RECHNUNG.SAVE_POSITIONEN(RECHNUNG.RK_ID)
+
+            '--------------------------------------------------------------------------------------------
+
+
+            '  End If
+            initRECHNUNG()
+            RaiseEvent SOMETHING_CHANGED(RECHNUNG.RK_ID)
+        End If
+    End Sub
 End Class
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.2.5.1")>
-<Assembly: AssemblyFileVersion("1.2.5.1")>
+<Assembly: AssemblyVersion("1.2.5.2")>
+<Assembly: AssemblyFileVersion("1.2.5.2")>
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -90,7 +90,7 @@
    <SignAssembly>false</SignAssembly>
  </PropertyGroup>
  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Test.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>SDL_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Accessibility" />
@@ -300,7 +300,7 @@
    </Reference>
    <Reference Include="Spire.Pdf, Version=8.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.Pdf.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.Pdf.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.Composition" />
--- a/SDL/mdm/Bestellung/frmSDLBestellungEintrag.vb
+++ b/SDL/mdm/Bestellung/frmSDLBestellungEintrag.vb
@@ -319,7 +319,7 @@ Public Class frmSDLBestellungEintrag

            Select Case If(IsNumeric(cboSDLNr._value), cboSDLNr._value, -1)
                Case 500
-                    Mail.To = If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "al@verag.ag", "david.reisinger@mtruck.at") 'office@mtruck.at
+                    Mail.To = If(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "al@verag.ag", "umweltplakette@mtruck.at") '"david.reisinger@mtruck.at") 'office@mtruck.at

                    Mail.HTMLBody = "<span style='font-size:11.0pt;font-family:""Arial""'>"
                    Mail.HTMLBody &= "Sehr geehrte Damen und Herren,"
--- a/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb
+++ b/SDL/zoll/usrCntlZOLLAuswertungen.Designer.vb
@@ -141,6 +141,8 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Label87 = New System.Windows.Forms.Label()
        Me.Label76 = New System.Windows.Forms.Label()
        Me.GroupBox11 = New System.Windows.Forms.GroupBox()
+        Me.Label94 = New System.Windows.Forms.Label()
+        Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Button22 = New System.Windows.Forms.Button()
        Me.Button19 = New System.Windows.Forms.Button()
        Me.Button18 = New System.Windows.Forms.Button()
@@ -252,8 +254,6 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Button14 = New System.Windows.Forms.Button()
        Me.PictureBox8 = New System.Windows.Forms.PictureBox()
        Me.pnl = New System.Windows.Forms.Panel()
-        Me.Label94 = New System.Windows.Forms.Label()
-        Me.cboBRG_Verimex = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.GroupBox1.SuspendLayout()
        Me.GroupBox2.SuspendLayout()
        CType(Me.picDurmaz, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1240,7 +1240,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.tbcntr.Location = New System.Drawing.Point(0, 57)
        Me.tbcntr.Name = "tbcntr"
        Me.tbcntr.SelectedIndex = 0
-        Me.tbcntr.Size = New System.Drawing.Size(694, 1829)
+        Me.tbcntr.Size = New System.Drawing.Size(677, 1829)
        Me.tbcntr.TabIndex = 22
        '
        'TabPage1
@@ -1283,7 +1283,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage1.Location = New System.Drawing.Point(4, 22)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(686, 1803)
+        Me.TabPage1.Size = New System.Drawing.Size(669, 1803)
        Me.TabPage1.TabIndex = 0
        Me.TabPage1.Text = "Bürgschaften"
        Me.TabPage1.UseVisualStyleBackColor = True
@@ -1571,9 +1571,9 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Label76.ForeColor = System.Drawing.SystemColors.ControlDarkDark
        Me.Label76.Location = New System.Drawing.Point(12, 1340)
        Me.Label76.Name = "Label76"
-        Me.Label76.Size = New System.Drawing.Size(214, 17)
+        Me.Label76.Size = New System.Drawing.Size(213, 17)
        Me.Label76.TabIndex = 33
-        Me.Label76.Text = "Auswertung LKW - OREGON"
+        Me.Label76.Text = "Auswertung LKW - VERIMEX"
        '
        'GroupBox11
        '
@@ -1598,6 +1598,28 @@ Partial Class usrCntlZOLLAuswertungen
        Me.GroupBox11.TabIndex = 32
        Me.GroupBox11.TabStop = False
        '
+        'Label94
+        '
+        Me.Label94.AutoSize = True
+        Me.Label94.Location = New System.Drawing.Point(181, 106)
+        Me.Label94.Name = "Label94"
+        Me.Label94.Size = New System.Drawing.Size(167, 13)
+        Me.Label94.TabIndex = 18
+        Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):"
+        '
+        'cboBRG_Verimex
+        '
+        Me.cboBRG_Verimex._allowedValuesFreiText = Nothing
+        Me.cboBRG_Verimex._allowFreiText = False
+        Me.cboBRG_Verimex._value = ""
+        Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+        Me.cboBRG_Verimex.DropDownWidth = 350
+        Me.cboBRG_Verimex.FormattingEnabled = True
+        Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120)
+        Me.cboBRG_Verimex.Name = "cboBRG_Verimex"
+        Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21)
+        Me.cboBRG_Verimex.TabIndex = 17
+        '
        'Button22
        '
        Me.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -2425,7 +2447,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage2.Location = New System.Drawing.Point(4, 22)
        Me.TabPage2.Name = "TabPage2"
        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(703, 1803)
+        Me.TabPage2.Size = New System.Drawing.Size(686, 1803)
        Me.TabPage2.TabIndex = 1
        Me.TabPage2.Text = "Kunden"
        Me.TabPage2.UseVisualStyleBackColor = True
@@ -2456,7 +2478,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage3.Location = New System.Drawing.Point(4, 22)
        Me.TabPage3.Name = "TabPage3"
        Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(703, 1803)
+        Me.TabPage3.Size = New System.Drawing.Size(686, 1803)
        Me.TabPage3.TabIndex = 2
        Me.TabPage3.Text = "Fiskalvertretung / EV-Veranlagung"
        Me.TabPage3.UseVisualStyleBackColor = True
@@ -2491,7 +2513,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage4.Controls.Add(Me.UsrCntlAuswertungenAufschub_Abgabenliste1)
        Me.TabPage4.Location = New System.Drawing.Point(4, 22)
        Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Size = New System.Drawing.Size(703, 1803)
+        Me.TabPage4.Size = New System.Drawing.Size(686, 1803)
        Me.TabPage4.TabIndex = 3
        Me.TabPage4.Text = "Aufschubdaten"
        Me.TabPage4.UseVisualStyleBackColor = True
@@ -2520,7 +2542,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.TabPage5.Location = New System.Drawing.Point(4, 22)
        Me.TabPage5.Name = "TabPage5"
        Me.TabPage5.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage5.Size = New System.Drawing.Size(703, 1803)
+        Me.TabPage5.Size = New System.Drawing.Size(686, 1803)
        Me.TabPage5.TabIndex = 4
        Me.TabPage5.Text = "UNISPED"
        Me.TabPage5.UseVisualStyleBackColor = True
@@ -2728,28 +2750,9 @@ Partial Class usrCntlZOLLAuswertungen
        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(694, 57)
+        Me.pnl.Size = New System.Drawing.Size(677, 57)
        Me.pnl.TabIndex = 23
        '
-        'Label94
-        '
-        Me.Label94.AutoSize = True
-        Me.Label94.Location = New System.Drawing.Point(181, 106)
-        Me.Label94.Name = "Label94"
-        Me.Label94.Size = New System.Drawing.Size(167, 13)
-        Me.Label94.TabIndex = 18
-        Me.Label94.Text = "Bürgschaft (keine Auswahl = alle):"
-        '
-        'cboBRG_Verimex
-        '
-        Me.cboBRG_Verimex.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
-        Me.cboBRG_Verimex.DropDownWidth = 350
-        Me.cboBRG_Verimex.FormattingEnabled = True
-        Me.cboBRG_Verimex.Location = New System.Drawing.Point(184, 120)
-        Me.cboBRG_Verimex.Name = "cboBRG_Verimex"
-        Me.cboBRG_Verimex.Size = New System.Drawing.Size(221, 21)
-        Me.cboBRG_Verimex.TabIndex = 17
-        '
        'usrCntlZOLLAuswertungen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2759,7 +2762,7 @@ Partial Class usrCntlZOLLAuswertungen
        Me.Controls.Add(Me.tbcntr)
        Me.Controls.Add(Me.pnl)
        Me.Name = "usrCntlZOLLAuswertungen"
-        Me.Size = New System.Drawing.Size(694, 1445)
+        Me.Size = New System.Drawing.Size(677, 1445)
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
        Me.GroupBox2.ResumeLayout(False)
--- a/SDL/zoll/usrCntlZOLLAuswertungen.vb
+++ b/SDL/zoll/usrCntlZOLLAuswertungen.vb
@@ -122,7 +122,7 @@ Public Class usrCntlZOLLAuswertungen
        cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7"))
        cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6"))
        cboEZOLLBrg.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092"))
-        cboEZOLLBrg.SelectedIndex = 1
+        cboEZOLLBrg.SelectedIndex = 0


        cboBRG_Verimex.Items.Clear()
@@ -132,13 +132,13 @@ Public Class usrCntlZOLLAuswertungen
        cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT510000G000FP7 - AT Brg", "05AT510000G000FP7"))
        cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("16AT520000G000VA6 - AT Brg IMEX", "16AT520000G000VA6"))
        cboBRG_Verimex.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("20AT520000G000092 - AT Brg ATILLA", "20AT520000G000092"))
-        cboBRG_Verimex.SelectedIndex = 1
+        cboBRG_Verimex.SelectedIndex = 0

        cboUnispedBrgDy.Items.Clear()
        cboUnispedBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
        cboUnispedBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("05AT500000G000EU9  - AT Brg UNISPED", "05AT500000G000EU9 "))
        cboUnispedBrgDy.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("17DE0000000071270  - DE Brg UNISPED", "17DE0000000071270 "))
-        cboUnispedBrgDy.SelectedIndex = 1
+        cboUnispedBrgDy.SelectedIndex = 0


        datEZOLLVon.Value = Now ' d.AddMonths(-3)
--- a/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cRechnungsausgang.vb
@@ -140,6 +140,13 @@ Public Class cRechnungsausgang
        Return getMaxRGUnterNr(FilialenNr, AbfertigungsNr, SpeditionsbuchUnterNr)
    End Function

+    Public Function checkAlreadyPrinted() As Integer
+        'Rechnung wurde bereits gedruck - evtl. bei überschneidenden Rechnungslauf --> Druck abbrechen!
+        If Me.RK_ID <= 0 Then Return False
+        Dim cnt = SQL.getValueTxtBySql("SELECT COUNT(*)  FROM [Rechnungsausgang] WHERE RK_ID='" & Me.RK_ID & "' and DruckDatumZeit is not null", "FMZOLL")
+        Return cnt > 0
+    End Function
+
    Public Shared Function getMaxRGUnterNr(FilialenNr As Integer, AbfertigungsNr As Integer, SpeditionsbuchUnterNr As Integer) As Integer
        ' Dim Nr = SQL.getValueTxtBySql("Select isnull([UnterNr], -1) + 1  FROM [Rechnungsausgang]  where [FilialenNr]='" & FilialenNr & "' And AbfertigungsNr='" & AbfertigungsNr & "' And SpeditionsbuchUnterNr='" & SpeditionsbuchUnterNr & "'  ORDER BY [UnterNr] desc", "FMZOLL")
        Dim Nr = SQL.getValueTxtBySql("Select TOP 1 isnull([UnterNr], -1) + 1  FROM [Rechnungsausgang]  where [FilialenNr]='" & FilialenNr & "' And AbfertigungsNr='" & AbfertigungsNr & "'   ORDER BY [UnterNr] desc", "FMZOLL")
--- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
+++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
@@ -6,6 +6,7 @@ Imports Ghostscript.NET.Processor
 Imports System.Runtime.InteropServices
 Imports System.Windows.Forms
 Imports System.Drawing
+Imports Spire.Pdf.Print


 Public Class cDATENSERVER
@@ -38,6 +39,7 @@ Public Class cDATENSERVER



+
    Sub New(da_kategorie, da_ordner, da_uOrdner1, da_uOrdner2, da_uOrdner3, da_name, Optional da_KundenNr = 0)
        Me.rootDir = DATENVERVER_OPTIONS.initRootDir()
        Me.da_KundenNr = da_KundenNr
@@ -1135,11 +1137,18 @@ Public Class cFormularManager
                Dim doc As New Spire.Pdf.PdfDocument(pdfPath)

                doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4
-                doc.PrintDocument.DefaultPageSettings.Landscape = True
-                doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize

-                doc.PrinterName = printerName
-                doc.PrintDocument.Print()
+                doc.PageSettings.Orientation = Spire.Pdf.PdfPageOrientation.Landscape
+                doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.FitSize, True)
+                doc.PrintSettings.PrinterName = printerName
+                doc.Print()
+
+
+                'doc.PrintDocument.DefaultPageSettings.Landscape = True
+                'doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
+
+                'doc.PrinterName = printerName
+                'doc.PrintDocument.Print()


                'Dim doc As New Spire.Pdf.PdfDocument
@@ -1231,10 +1240,16 @@ Public Class cFormularManager
                        Dim doc As Spire.Pdf.PdfDocument = New Spire.Pdf.PdfDocument(stream)
                        If doc IsNot Nothing Then
                            doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4
-                            doc.PrintDocument.DefaultPageSettings.Landscape = True
-                            doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
-                            doc.PrinterName = printerName
-                            doc.PrintDocument.Print()
+                            'doc.PrintDocument.DefaultPageSettings.Landscape = True
+                            'doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
+                            'doc.PrinterName = printerName
+                            'doc.PrintDocument.Print()
+
+                            doc.PageSettings.Orientation = Spire.Pdf.PdfPageOrientation.Landscape
+                            doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.FitSize, True)
+                            doc.PrintSettings.PrinterName = printerName
+                            doc.Print()
+
                        End If
                    End Using
                End Using
@@ -1266,8 +1281,11 @@ Public Class cFormularManager
            doc.LoadFromHTML(URL, True, True, True)
            If doc IsNot Nothing Then
                doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4
-                doc.PrintDocument.DefaultPageSettings.Landscape = True
-                doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
+                ' doc.PrintDocument.DefaultPageSettings.Landscape = True
+                'doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
+
+                doc.PageSettings.Orientation = Spire.Pdf.PdfPageOrientation.Landscape
+                doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.FitSize, True)
                ' doc.PrinterName = printerName
                ' doc.PrintDocument.Print()
                doc.SaveToFile(targetPath)
@@ -1883,7 +1901,6 @@ Public Class DATENVERVER_OPTIONS
            If kdnr IsNot Nothing AndAlso IsNumeric(kdnr) AndAlso kdnr > 0 Then
                kdnr_path = kdnr
            End If
-
            If kategorie <> "" Then
                Dim dir = ""
                dir &= rootDir
@@ -1897,8 +1914,6 @@ Public Class DATENVERVER_OPTIONS
                    If Not IO.Directory.Exists(dir) Then
                        IO.Directory.CreateDirectory(dir)
                    End If
-
-
                    Dim zusatz = "" : Dim zusatzcnt = 1
                    While IO.File.Exists(dir & dateiName & zusatz & If(bezeichnung.ToString.EndsWith(endung), "", endung))
                        zusatz = "_" & zusatzcnt
@@ -1920,25 +1935,20 @@ Public Class DATENVERVER_OPTIONS
            Return ""
        End Try
    End Function
-
    Shared Function OPEN_PATH(path As String) As Boolean
        Try
            If Not IO.File.Exists(path) Then MsgBox("Die Datei existiert nicht") : Return False
-
            Dim fi As New IO.DirectoryInfo(path)
            Dim destPath = DATENVERVER_OPTIONS.getTMPPath(fi.Name, fi.Extension, , False)

            IO.File.Copy(path, destPath, True)
            Process.Start(destPath)
            Return True
-
        Catch ex As Exception
            MsgBox(ex.Message & ex.StackTrace)
            Return False
        End Try
    End Function
-
-
    Public Shared Function getPDFViaSpirePDF_FromFile(File As String, Optional targetPath As String = "") As String
        Try
            If targetPath = "" Then targetPath = TMP_PATH
@@ -1949,8 +1959,10 @@ Public Class DATENVERVER_OPTIONS
            'doc.LoadFromFile(File)
            If doc IsNot Nothing Then
                doc.PageSettings.Size = Spire.Pdf.PdfPageSize.A4
-                doc.PrintDocument.DefaultPageSettings.Landscape = True
-                doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
+                ' doc.PrintDocument.DefaultPageSettings.Landscape = True
+                ' doc.PageScaling = Spire.Pdf.PdfPrintPageScaling.FitSize
+                doc.PageSettings.Orientation = Spire.Pdf.PdfPageOrientation.Landscape
+                doc.PrintSettings.SelectSinglePageLayout(PdfSinglePageScalingMode.FitSize, True)
                ' doc.PrinterName = printerName
                ' doc.PrintDocument.Print()
                doc.SaveToFile(targetPath)
--- a/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
+++ b/VERAG_PROG_ALLGEMEIN/VERAG_PROG_ALLGEMEIN.vbproj
@@ -122,17 +122,17 @@
    <Reference Include="RichTextBoxEx">
      <HintPath>..\..\..\dll\RichTextBoxEx.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.License, Version=1.3.15.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
+    <Reference Include="Spire.License, Version=1.4.0.46, Culture=neutral, PublicKeyToken=b1144360237c8b3f, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.License.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.License.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.Pdf, Version=7.6.0.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+    <Reference Include="Spire.Pdf, Version=8.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.Pdf.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.Pdf.dll</HintPath>
    </Reference>
-    <Reference Include="Spire.PdfViewer.Forms, Version=6.6.0.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
+    <Reference Include="Spire.PdfViewer.Forms, Version=7.1.4.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\dll\Spire.PDF\2022\Spire.PdfViewer.Forms.dll</HintPath>
+      <HintPath>..\..\..\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />