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

SDL/USTV/frmUSTVoffeneAntraege.Designer.vb

@@ -43,6 +43,7 @@ Partial Class frmUSTVoffeneAntraege
         Me.Label3 = New System.Windows.Forms.Label()
         Me.cbxAlleoffenen = New System.Windows.Forms.CheckBox()
         Me.lblKunde = New System.Windows.Forms.Label()
+        Me.Button3 = New System.Windows.Forms.Button()
         Me.FlowLayoutPanel.SuspendLayout()
         CType(Me.MyDatagridview1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel4.SuspendLayout()
@@ -58,6 +59,7 @@ Partial Class frmUSTVoffeneAntraege
         Me.FlowLayoutPanel.Controls.Add(Me.Button7)
         Me.FlowLayoutPanel.Controls.Add(Me.Button1)
         Me.FlowLayoutPanel.Controls.Add(Me.Button2)
+        Me.FlowLayoutPanel.Controls.Add(Me.Button3)
         Me.FlowLayoutPanel.Location = New System.Drawing.Point(12, 29)
         Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
         Me.FlowLayoutPanel.Size = New System.Drawing.Size(1409, 31)
@@ -124,7 +126,8 @@ Partial Class frmUSTVoffeneAntraege
         Me.MyDatagridview1.AllowUserToDeleteRows = False
         Me.MyDatagridview1.AllowUserToResizeColumns = False
         Me.MyDatagridview1.AllowUserToResizeRows = False
-        Me.MyDatagridview1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+        Me.MyDatagridview1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.MyDatagridview1.Location = New System.Drawing.Point(12, 98)
@@ -137,7 +140,7 @@ Partial Class frmUSTVoffeneAntraege
         '
         'Label2
         '
-        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label2.AutoSize = True
         Me.Label2.Location = New System.Drawing.Point(1223, 639)
         Me.Label2.Name = "Label2"
@@ -159,7 +162,7 @@ Partial Class frmUSTVoffeneAntraege
         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.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtAnzahl.ForeColor = System.Drawing.Color.Black
         Me.txtAnzahl.Location = New System.Drawing.Point(1321, 636)
         Me.txtAnzahl.MaxLineLength = -1
@@ -172,7 +175,7 @@ Partial Class frmUSTVoffeneAntraege
         '
         'Label1
         '
-        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label1.AutoSize = True
         Me.Label1.Location = New System.Drawing.Point(1225, 661)
         Me.Label1.Name = "Label1"
@@ -194,7 +197,7 @@ Partial Class frmUSTVoffeneAntraege
         Me.txtMWST._value = ""
         Me.txtMWST._Waehrung = True
         Me.txtMWST._WaehrungZeichen = True
-        Me.txtMWST.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtMWST.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtMWST.ForeColor = System.Drawing.Color.Black
         Me.txtMWST.Location = New System.Drawing.Point(1321, 658)
         Me.txtMWST.MaxLineLength = -1
@@ -207,6 +210,8 @@ Partial Class frmUSTVoffeneAntraege
         '
         'Panel4
         '
+        Me.Panel4.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel4.Controls.Add(Me.Label46)
         Me.Panel4.Controls.Add(Me.dat_Sum_Bis)
         Me.Panel4.Controls.Add(Me.Label45)
@@ -288,6 +293,7 @@ Partial Class frmUSTVoffeneAntraege
         '
         'cbxAlleoffenen
         '
+        Me.cbxAlleoffenen.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.cbxAlleoffenen.AutoSize = True
         Me.cbxAlleoffenen.Location = New System.Drawing.Point(1137, 70)
         Me.cbxAlleoffenen.Name = "cbxAlleoffenen"
@@ -300,11 +306,23 @@ Partial Class frmUSTVoffeneAntraege
         '
         Me.lblKunde.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblKunde.AutoSize = True
-        Me.lblKunde.Location = New System.Drawing.Point(464, 75)
+        Me.lblKunde.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblKunde.Location = New System.Drawing.Point(455, 74)
         Me.lblKunde.Name = "lblKunde"
-        Me.lblKunde.Size = New System.Drawing.Size(0, 13)
+        Me.lblKunde.Size = New System.Drawing.Size(0, 16)
         Me.lblKunde.TabIndex = 45
         '
+        'Button3
+        '
+        Me.Button3.BackColor = System.Drawing.Color.FloralWhite
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.Location = New System.Drawing.Point(507, 3)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(120, 23)
+        Me.Button3.TabIndex = 4
+        Me.Button3.Text = "IDS"
+        Me.Button3.UseVisualStyleBackColor = False
+        '
         'frmUSTVoffeneAntraege
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -353,4 +371,5 @@ Partial Class frmUSTVoffeneAntraege
     Friend WithEvents Button2 As Button
     Friend WithEvents cbxAlleoffenen As CheckBox
     Friend WithEvents lblKunde As Label
+    Friend WithEvents Button3 As Button
 End Class

SDL/USTV/frmUSTVoffeneAntraege.vb

@@ -1,6 +1,4 @@
-Imports GrapeCity.DataVisualization.TypeScript
+Public Class frmUSTVoffeneAntraege
-
-Public Class frmUSTVoffeneAntraege
 
     Public LIEFERANT = ""
     Dim datumBis As Date = Nothing
@@ -304,12 +302,75 @@ Public Class frmUSTVoffeneAntraege
 
     End Sub
 
+    Sub initDgv_IDS(anz As Integer, Optional kdnr As Integer = -1)
+
+        Dim top = ""
+        If anz > 0 Then top = "TOP (" & anz & ")"
+
+        Dim sqlwhere = ""
+        If kdnr > 0 Then
+            sqlwhere &= " and Kundennummer = " & kdnr
+        End If
+
+        MsgBox(LIEFERANT & " nocht nicht implementiert!")
+
+        'With MyDatagridview1
+        '    .Columns.Clear()
+        '    'Exit Sub
+        '    'MsgBox(.sql)
+        '    Dim sqlstring = "Select " & top & " [Kundennummer], [Lieferland_ISO2], [Rechnungsdatum], [Abrechnungsnummer], sum([Gesamtbetrag_Brutto_in_Darstellwährung]) as [Gesamtbetrag_Brutto_in_Darstellwährung], sum([Gesamtbetrag_Umsatzsteuer_in_Darstellwährung]) as [Gesamtbetrag_Umsatzsteuer_in_Darstellwährung], daId  FROM [tblUTAImportNew]  
+        '                where cast([Rechnungsdatum] As Date) between '" & dat_Sum_Von.Value & "' And '" & dat_Sum_Bis.Value & "' And [archiv] <> 1 " & sqlwhere &
+        '                "group by  [Rechnungsdatum], Kundennummer, [Lieferland_ISO2], [Abrechnungsnummer], daId "
+
+        '    .SET_SQL(sqlstring, "FMZOLL")
+        '    .LOAD()
+        '    If .Columns.Count > 0 Then
+
+        '        .Columns("Kundennummer").HeaderText = "KdNr"
+        '        .Columns("Lieferland_ISO2").HeaderText = "Land"
+        '        .Columns("Rechnungsdatum").HeaderText = "RE-Datum"
+        '        .Columns("Abrechnungsnummer").HeaderText = "RE-Nr"
+        '        .Columns("Gesamtbetrag_Brutto_in_Darstellwährung").HeaderText = "Gesamtsumme Euro"
+        '        .Columns("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").HeaderText = "MWSt Euro"
+        '        .Columns("daId").Visible = False
+        '        .Columns("Kundennummer").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+        '        .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells
+
+        '    End If
+
+        '    Dim sumMwSt As Double = 0
+
+        '    Dim c As New DataGridViewImageColumn
+        '    c.Name = "clmnPDF" : c.HeaderText = "RE"
+        '    '    c.Image = Nothing
+        '    c.DefaultCellStyle.NullValue = Nothing
+        '    c.ImageLayout = DataGridViewImageCellLayout.Zoom
+        '    c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White
+        '    'c.DefaultCellStyle.Tag = "Therefore anzeigen"
+
+        '    .Columns.Add(c)
+
+
+        '    For Each r As DataGridViewRow In .Rows
+        '        sumMwSt += If(IsNumeric(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), CDbl(r.Cells("Gesamtbetrag_Umsatzsteuer_in_Darstellwährung").Value), 0)
+        '        If Not IsDBNull(r.Cells("daId").Value) AndAlso r.Cells("daId").Value > 0 Then DirectCast(r.Cells("clmnPDF"), DataGridViewImageCell).Value = My.Resources.pdf
+        '    Next
+
+        '    txtAnzahl.Text = .Rows.Count
+        '    txtMWST.Text = sumMwSt
+
+
+        'End With
+
+    End Sub
+
     Sub init()
         Select Case LIEFERANT.ToString.ToLower
             Case "plose" : initDgv_PLOSE(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr))
             Case "rmc" : initDgv_RMC(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr))
             Case "mse" : initDgv_MSE(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr))
             Case "uta" : initDgv_UTA(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr))
+            Case "ids" : initDgv_IDS(txtmaxAnz.Text, IIf(cbxAlleoffenen.Checked, -1, kdNr))
         End Select
     End Sub
 
@@ -324,8 +385,13 @@ Public Class frmUSTVoffeneAntraege
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         initLieferant("MSE", sender)
     End Sub
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+        initLieferant("IDS", sender)
+    End Sub
 
     Private Sub cbxAlleoffenen_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAlleoffenen.CheckedChanged
         init()
     End Sub
+
+
 End Class

SDL/USTV/usrCntlUSTV.Designer.vb

@@ -28,10 +28,16 @@ Partial Class usrCntlUSTV
         Me.dgvUSTV = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.Label1 = New System.Windows.Forms.Label()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.txtSumDiff = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.btnKundendatenaktualisieren = New System.Windows.Forms.Button()
+        Me.txtSumErst = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.txtSumUst = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtVZBetrag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label5 = New System.Windows.Forms.Label()
         Me.Label8 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
         Me.txt3470Betrag = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label3 = New System.Windows.Forms.Label()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.txtVorschaubetrGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.Label6 = New System.Windows.Forms.Label()
@@ -49,18 +55,13 @@ Partial Class usrCntlUSTV
         Me.FlatButton2 = New System.Windows.Forms.Button()
         Me.Panel2 = New System.Windows.Forms.Panel()
         Me.Panel3 = New System.Windows.Forms.Panel()
-        Me.txtSumDiff = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtSumErst = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtSumUst = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
         Me.btnMail = New System.Windows.Forms.Button()
         Me.btnPLOSEAlle = New System.Windows.Forms.Button()
         Me.Button5 = New System.Windows.Forms.Button()
         Me.Button8 = New System.Windows.Forms.Button()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.Label9 = New System.Windows.Forms.Label()
         CType(Me.dgvUSTV, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         Me.Panel2.SuspendLayout()
@@ -72,7 +73,7 @@ Partial Class usrCntlUSTV
         Me.pnlFilter.BackColor = System.Drawing.Color.White
         Me.pnlFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.pnlFilter.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlFilter.Location = New System.Drawing.Point(0, 53)
+        Me.pnlFilter.Location = New System.Drawing.Point(0, 77)
         Me.pnlFilter.Name = "pnlFilter"
         Me.pnlFilter.Size = New System.Drawing.Size(1627, 31)
         Me.pnlFilter.TabIndex = 6
@@ -86,12 +87,12 @@ Partial Class usrCntlUSTV
         Me.dgvUSTV.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvUSTV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvUSTV.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.dgvUSTV.Location = New System.Drawing.Point(0, 84)
+        Me.dgvUSTV.Location = New System.Drawing.Point(0, 108)
         Me.dgvUSTV.MultiSelect = False
         Me.dgvUSTV.Name = "dgvUSTV"
         Me.dgvUSTV.ReadOnly = True
         Me.dgvUSTV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvUSTV.Size = New System.Drawing.Size(1627, 455)
+        Me.dgvUSTV.Size = New System.Drawing.Size(1627, 431)
         Me.dgvUSTV.TabIndex = 1
         '
         'Label1
@@ -108,10 +109,17 @@ Partial Class usrCntlUSTV
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer))
+        Me.Panel1.Controls.Add(Me.Label9)
+        Me.Panel1.Controls.Add(Me.txtSumDiff)
         Me.Panel1.Controls.Add(Me.btnKundendatenaktualisieren)
+        Me.Panel1.Controls.Add(Me.txtSumErst)
+        Me.Panel1.Controls.Add(Me.txtSumUst)
         Me.Panel1.Controls.Add(Me.txtVZBetrag)
+        Me.Panel1.Controls.Add(Me.Label5)
         Me.Panel1.Controls.Add(Me.Label8)
+        Me.Panel1.Controls.Add(Me.Label4)
         Me.Panel1.Controls.Add(Me.txt3470Betrag)
+        Me.Panel1.Controls.Add(Me.Label3)
         Me.Panel1.Controls.Add(Me.Label7)
         Me.Panel1.Controls.Add(Me.txtVorschaubetrGes)
         Me.Panel1.Controls.Add(Me.Label6)
@@ -129,11 +137,37 @@ Partial Class usrCntlUSTV
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
         Me.Panel1.Location = New System.Drawing.Point(0, 0)
         Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(1627, 84)
+        Me.Panel1.Size = New System.Drawing.Size(1627, 108)
         Me.Panel1.TabIndex = 0
         '
+        'txtSumDiff
+        '
+        Me.txtSumDiff._DateTimeOnly = False
+        Me.txtSumDiff._numbersOnly = False
+        Me.txtSumDiff._numbersOnlyKommastellen = ""
+        Me.txtSumDiff._numbersOnlyTrennzeichen = True
+        Me.txtSumDiff._Prozent = False
+        Me.txtSumDiff._ShortDateNew = False
+        Me.txtSumDiff._ShortDateOnly = False
+        Me.txtSumDiff._TimeOnly = False
+        Me.txtSumDiff._TimeOnly_Seconds = False
+        Me.txtSumDiff._value = ""
+        Me.txtSumDiff._Waehrung = True
+        Me.txtSumDiff._WaehrungZeichen = True
+        Me.txtSumDiff.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtSumDiff.ForeColor = System.Drawing.Color.Black
+        Me.txtSumDiff.Location = New System.Drawing.Point(1321, 45)
+        Me.txtSumDiff.MaxLineLength = -1
+        Me.txtSumDiff.MaxLines_Warning = ""
+        Me.txtSumDiff.MaxLines_Warning_Label = Nothing
+        Me.txtSumDiff.Name = "txtSumDiff"
+        Me.txtSumDiff.ReadOnly = True
+        Me.txtSumDiff.Size = New System.Drawing.Size(107, 20)
+        Me.txtSumDiff.TabIndex = 32
+        '
         'btnKundendatenaktualisieren
         '
+        Me.btnKundendatenaktualisieren.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnKundendatenaktualisieren.Enabled = False
         Me.btnKundendatenaktualisieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnKundendatenaktualisieren.ForeColor = System.Drawing.Color.Black
@@ -142,9 +176,59 @@ Partial Class usrCntlUSTV
         Me.btnKundendatenaktualisieren.Name = "btnKundendatenaktualisieren"
         Me.btnKundendatenaktualisieren.Size = New System.Drawing.Size(127, 39)
         Me.btnKundendatenaktualisieren.TabIndex = 33
-        Me.btnKundendatenaktualisieren.Text = "Kundendaten aktualisieren"
+        Me.btnKundendatenaktualisieren.Text = "Kundendaten aktualisieren*"
         Me.btnKundendatenaktualisieren.UseVisualStyleBackColor = True
         '
+        'txtSumErst
+        '
+        Me.txtSumErst._DateTimeOnly = False
+        Me.txtSumErst._numbersOnly = False
+        Me.txtSumErst._numbersOnlyKommastellen = ""
+        Me.txtSumErst._numbersOnlyTrennzeichen = True
+        Me.txtSumErst._Prozent = False
+        Me.txtSumErst._ShortDateNew = False
+        Me.txtSumErst._ShortDateOnly = False
+        Me.txtSumErst._TimeOnly = False
+        Me.txtSumErst._TimeOnly_Seconds = False
+        Me.txtSumErst._value = ""
+        Me.txtSumErst._Waehrung = True
+        Me.txtSumErst._WaehrungZeichen = True
+        Me.txtSumErst.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtSumErst.ForeColor = System.Drawing.Color.Black
+        Me.txtSumErst.Location = New System.Drawing.Point(1321, 25)
+        Me.txtSumErst.MaxLineLength = -1
+        Me.txtSumErst.MaxLines_Warning = ""
+        Me.txtSumErst.MaxLines_Warning_Label = Nothing
+        Me.txtSumErst.Name = "txtSumErst"
+        Me.txtSumErst.ReadOnly = True
+        Me.txtSumErst.Size = New System.Drawing.Size(107, 20)
+        Me.txtSumErst.TabIndex = 31
+        '
+        'txtSumUst
+        '
+        Me.txtSumUst._DateTimeOnly = False
+        Me.txtSumUst._numbersOnly = False
+        Me.txtSumUst._numbersOnlyKommastellen = ""
+        Me.txtSumUst._numbersOnlyTrennzeichen = True
+        Me.txtSumUst._Prozent = False
+        Me.txtSumUst._ShortDateNew = False
+        Me.txtSumUst._ShortDateOnly = False
+        Me.txtSumUst._TimeOnly = False
+        Me.txtSumUst._TimeOnly_Seconds = False
+        Me.txtSumUst._value = ""
+        Me.txtSumUst._Waehrung = True
+        Me.txtSumUst._WaehrungZeichen = True
+        Me.txtSumUst.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.txtSumUst.ForeColor = System.Drawing.Color.Black
+        Me.txtSumUst.Location = New System.Drawing.Point(1321, 5)
+        Me.txtSumUst.MaxLineLength = -1
+        Me.txtSumUst.MaxLines_Warning = ""
+        Me.txtSumUst.MaxLines_Warning_Label = Nothing
+        Me.txtSumUst.Name = "txtSumUst"
+        Me.txtSumUst.ReadOnly = True
+        Me.txtSumUst.Size = New System.Drawing.Size(107, 20)
+        Me.txtSumUst.TabIndex = 30
+        '
         'txtVZBetrag
         '
         Me.txtVZBetrag._DateTimeOnly = False
@@ -161,7 +245,7 @@ Partial Class usrCntlUSTV
         Me.txtVZBetrag._WaehrungZeichen = True
         Me.txtVZBetrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtVZBetrag.ForeColor = System.Drawing.Color.Black
-        Me.txtVZBetrag.Location = New System.Drawing.Point(1290, 6)
+        Me.txtVZBetrag.Location = New System.Drawing.Point(1093, 45)
         Me.txtVZBetrag.MaxLineLength = -1
         Me.txtVZBetrag.MaxLines_Warning = ""
         Me.txtVZBetrag.MaxLines_Warning_Label = Nothing
@@ -170,16 +254,36 @@ Partial Class usrCntlUSTV
         Me.txtVZBetrag.Size = New System.Drawing.Size(107, 20)
         Me.txtVZBetrag.TabIndex = 51
         '
+        'Label5
+        '
+        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(1216, 48)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(79, 13)
+        Me.Label5.TabIndex = 29
+        Me.Label5.Text = "Differenzbetrag"
+        '
         'Label8
         '
         Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(1229, 11)
+        Me.Label8.Location = New System.Drawing.Point(1032, 48)
         Me.Label8.Name = "Label8"
         Me.Label8.Size = New System.Drawing.Size(55, 13)
         Me.Label8.TabIndex = 50
         Me.Label8.Text = "VZ-Betrag"
         '
+        'Label4
+        '
+        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(1216, 28)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(90, 13)
+        Me.Label4.TabIndex = 28
+        Me.Label4.Text = "Erstattungsbetrag"
+        '
         'txt3470Betrag
         '
         Me.txt3470Betrag._DateTimeOnly = False
@@ -196,7 +300,7 @@ Partial Class usrCntlUSTV
         Me.txt3470Betrag._WaehrungZeichen = True
         Me.txt3470Betrag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txt3470Betrag.ForeColor = System.Drawing.Color.Black
-        Me.txt3470Betrag.Location = New System.Drawing.Point(1102, 5)
+        Me.txt3470Betrag.Location = New System.Drawing.Point(1093, 25)
         Me.txt3470Betrag.MaxLineLength = -1
         Me.txt3470Betrag.MaxLines_Warning = ""
         Me.txt3470Betrag.MaxLines_Warning_Label = Nothing
@@ -205,11 +309,21 @@ Partial Class usrCntlUSTV
         Me.txt3470Betrag.Size = New System.Drawing.Size(107, 20)
         Me.txt3470Betrag.TabIndex = 49
         '
+        'Label3
+        '
+        Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(1216, 7)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(59, 13)
+        Me.Label3.TabIndex = 27
+        Me.Label3.Text = "USt-Betrag"
+        '
         'Label7
         '
         Me.Label7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(1065, 10)
+        Me.Label7.Location = New System.Drawing.Point(1056, 28)
         Me.Label7.Name = "Label7"
         Me.Label7.Size = New System.Drawing.Size(31, 13)
         Me.Label7.TabIndex = 48
@@ -231,7 +345,7 @@ Partial Class usrCntlUSTV
         Me.txtVorschaubetrGes._WaehrungZeichen = True
         Me.txtVorschaubetrGes.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtVorschaubetrGes.ForeColor = System.Drawing.Color.Black
-        Me.txtVorschaubetrGes.Location = New System.Drawing.Point(940, 5)
+        Me.txtVorschaubetrGes.Location = New System.Drawing.Point(1093, 4)
         Me.txtVorschaubetrGes.MaxLineLength = -1
         Me.txtVorschaubetrGes.MaxLines_Warning = ""
         Me.txtVorschaubetrGes.MaxLines_Warning_Label = Nothing
@@ -244,7 +358,7 @@ Partial Class usrCntlUSTV
         '
         Me.Label6.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(813, 9)
+        Me.Label6.Location = New System.Drawing.Point(969, 7)
         Me.Label6.Name = "Label6"
         Me.Label6.Size = New System.Drawing.Size(121, 13)
         Me.Label6.TabIndex = 33
@@ -441,12 +555,6 @@ Partial Class usrCntlUSTV
         'Panel3
         '
         Me.Panel3.AutoSize = True
-        Me.Panel3.Controls.Add(Me.txtSumDiff)
-        Me.Panel3.Controls.Add(Me.txtSumErst)
-        Me.Panel3.Controls.Add(Me.txtSumUst)
-        Me.Panel3.Controls.Add(Me.Label5)
-        Me.Panel3.Controls.Add(Me.Label4)
-        Me.Panel3.Controls.Add(Me.Label3)
         Me.Panel3.Controls.Add(Me.btnMail)
         Me.Panel3.Controls.Add(Me.btnPLOSEAlle)
         Me.Panel3.Controls.Add(Me.Button5)
@@ -460,119 +568,15 @@ Partial Class usrCntlUSTV
         Me.Panel3.Size = New System.Drawing.Size(1627, 77)
         Me.Panel3.TabIndex = 0
         '
-        'txtSumDiff
-        '
-        Me.txtSumDiff._DateTimeOnly = False
-        Me.txtSumDiff._numbersOnly = False
-        Me.txtSumDiff._numbersOnlyKommastellen = ""
-        Me.txtSumDiff._numbersOnlyTrennzeichen = True
-        Me.txtSumDiff._Prozent = False
-        Me.txtSumDiff._ShortDateNew = False
-        Me.txtSumDiff._ShortDateOnly = False
-        Me.txtSumDiff._TimeOnly = False
-        Me.txtSumDiff._TimeOnly_Seconds = False
-        Me.txtSumDiff._value = ""
-        Me.txtSumDiff._Waehrung = True
-        Me.txtSumDiff._WaehrungZeichen = True
-        Me.txtSumDiff.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtSumDiff.ForeColor = System.Drawing.Color.Black
-        Me.txtSumDiff.Location = New System.Drawing.Point(1179, 46)
-        Me.txtSumDiff.MaxLineLength = -1
-        Me.txtSumDiff.MaxLines_Warning = ""
-        Me.txtSumDiff.MaxLines_Warning_Label = Nothing
-        Me.txtSumDiff.Name = "txtSumDiff"
-        Me.txtSumDiff.ReadOnly = True
-        Me.txtSumDiff.Size = New System.Drawing.Size(107, 20)
-        Me.txtSumDiff.TabIndex = 32
-        '
-        'txtSumErst
-        '
-        Me.txtSumErst._DateTimeOnly = False
-        Me.txtSumErst._numbersOnly = False
-        Me.txtSumErst._numbersOnlyKommastellen = ""
-        Me.txtSumErst._numbersOnlyTrennzeichen = True
-        Me.txtSumErst._Prozent = False
-        Me.txtSumErst._ShortDateNew = False
-        Me.txtSumErst._ShortDateOnly = False
-        Me.txtSumErst._TimeOnly = False
-        Me.txtSumErst._TimeOnly_Seconds = False
-        Me.txtSumErst._value = ""
-        Me.txtSumErst._Waehrung = True
-        Me.txtSumErst._WaehrungZeichen = True
-        Me.txtSumErst.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtSumErst.ForeColor = System.Drawing.Color.Black
-        Me.txtSumErst.Location = New System.Drawing.Point(1179, 26)
-        Me.txtSumErst.MaxLineLength = -1
-        Me.txtSumErst.MaxLines_Warning = ""
-        Me.txtSumErst.MaxLines_Warning_Label = Nothing
-        Me.txtSumErst.Name = "txtSumErst"
-        Me.txtSumErst.ReadOnly = True
-        Me.txtSumErst.Size = New System.Drawing.Size(107, 20)
-        Me.txtSumErst.TabIndex = 31
-        '
-        'txtSumUst
-        '
-        Me.txtSumUst._DateTimeOnly = False
-        Me.txtSumUst._numbersOnly = False
-        Me.txtSumUst._numbersOnlyKommastellen = ""
-        Me.txtSumUst._numbersOnlyTrennzeichen = True
-        Me.txtSumUst._Prozent = False
-        Me.txtSumUst._ShortDateNew = False
-        Me.txtSumUst._ShortDateOnly = False
-        Me.txtSumUst._TimeOnly = False
-        Me.txtSumUst._TimeOnly_Seconds = False
-        Me.txtSumUst._value = ""
-        Me.txtSumUst._Waehrung = True
-        Me.txtSumUst._WaehrungZeichen = True
-        Me.txtSumUst.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtSumUst.ForeColor = System.Drawing.Color.Black
-        Me.txtSumUst.Location = New System.Drawing.Point(1179, 6)
-        Me.txtSumUst.MaxLineLength = -1
-        Me.txtSumUst.MaxLines_Warning = ""
-        Me.txtSumUst.MaxLines_Warning_Label = Nothing
-        Me.txtSumUst.Name = "txtSumUst"
-        Me.txtSumUst.ReadOnly = True
-        Me.txtSumUst.Size = New System.Drawing.Size(107, 20)
-        Me.txtSumUst.TabIndex = 30
-        '
-        'Label5
-        '
-        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(1074, 49)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(79, 13)
-        Me.Label5.TabIndex = 29
-        Me.Label5.Text = "Differenzbetrag"
-        '
-        'Label4
-        '
-        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(1074, 29)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(90, 13)
-        Me.Label4.TabIndex = 28
-        Me.Label4.Text = "Erstattungsbetrag"
-        '
-        'Label3
-        '
-        Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(1074, 8)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(59, 13)
-        Me.Label3.TabIndex = 27
-        Me.Label3.Text = "USt-Betrag"
-        '
         'btnMail
         '
+        Me.btnMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
         Me.btnMail.ForeColor = System.Drawing.Color.Black
         Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnMail.Location = New System.Drawing.Point(972, 5)
+        Me.btnMail.Location = New System.Drawing.Point(1288, 5)
         Me.btnMail.Name = "btnMail"
-        Me.btnMail.Size = New System.Drawing.Size(75, 39)
+        Me.btnMail.Size = New System.Drawing.Size(92, 39)
         Me.btnMail.TabIndex = 25
         Me.btnMail.Text = "Anträge"
         Me.btnMail.UseVisualStyleBackColor = True
@@ -630,6 +634,16 @@ Partial Class usrCntlUSTV
         Me.ContextMenuStrip2.Name = "ContextMenuStrip1"
         Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4)
         '
+        'Label9
+        '
+        Me.Label9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label9.AutoSize = True
+        Me.Label9.Location = New System.Drawing.Point(1483, 52)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(102, 13)
+        Me.Label9.TabIndex = 52
+        Me.Label9.Text = "*bis 30.06 -> Vorjahr"
+        '
         'usrCntlUSTV
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -645,7 +659,6 @@ Partial Class usrCntlUSTV
         Me.Panel2.ResumeLayout(False)
         Me.Panel2.PerformLayout()
         Me.Panel3.ResumeLayout(False)
-        Me.Panel3.PerformLayout()
         Me.ResumeLayout(False)
 
     End Sub
@@ -686,4 +699,5 @@ Partial Class usrCntlUSTV
     Friend WithEvents Label7 As Label
     Friend WithEvents ContextMenuStrip2 As ContextMenuStrip
     Friend WithEvents btnKundendatenaktualisieren As Button
+    Friend WithEvents Label9 As Label
 End Class

SDL/USTV/usrCntlUSTV.vb

@@ -19,12 +19,12 @@ Public Class usrCntlUSTV
 
     Sub init(Optional kdNr = -1)
         pnlFilter.AutoScroll = False
+        btnKundendatenaktualisieren.Enabled = False
         '  MsgBox(kdNr)
         If kdNr > 0 Then
             Me.kdNr = kdNr
             KdSearchBox1.KdNr = kdNr
             KdSearchBox1.Enabled = False
-            'btnKundendatenaktualisieren.Enabled = True
         End If
 
         btnPLOSEAlle.Enabled = KdSearchBox1.KdNr > 0
@@ -54,8 +54,14 @@ Public Class usrCntlUSTV
             .AllowUserToOrderColumns = False
             .AllowUserToResizeRows = False
 
+
+            btnKundendatenaktualisieren.Enabled = KdSearchBox1.KdNr > 0 AndAlso .RowCount > 0
+
+
+
             If .Columns.Count > 0 Then
 
+
                 Dim DataGridViewCellStyleDate = New DataGridViewCellStyle()
                 DataGridViewCellStyleDate.Format = "MM/yyyy"
 
@@ -144,16 +150,35 @@ Public Class usrCntlUSTV
             Dim GesamtUSteuer As Double = 0
             Dim GesamtErstattung As Double = 0
             Dim Differnezbetrag As Double = 0
-
             Dim Gesamt3470 As Double = 0
             Dim GesamtVZBetrag As Double = 0
+            Dim VorschaubetrGes As Double = 0
 
             If KdSearchBox1.KdNr > 0 Then
-                GesamtUSteuer = SQL.DLookup("isnull(sum(UStVAn_USteuerbetragEUR),0)", "tblUStVAntrag", "UStVAn_KuNr='" & KdSearchBox1.KdNr & "'", "FMZOLL", "0")
+                Dim dt As New DataTable
-                GesamtErstattung = SQL.DLookup("isnull(sum(UStVAn_ErstattungsbetragEUR),0)", "tblUStVAntrag", "UStVAn_KuNr='" & KdSearchBox1.KdNr & "'", "FMZOLL", "0")
+                dt = SQL.loadDgvBySql("SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR                                                                
+                                FROM Kunden 
+                                WHERE Kunden.KundenNr = " & KdSearchBox1.KdNr, "FMZOLL")
 
-                Gesamt3470 = SQL.DLookup("isnull(sum(UStVAn_3470),0)", "tblUStVAntrag", "UStVAn_KuNr='" & KdSearchBox1.KdNr & "'", "FMZOLL", "0")
+                If dt.Rows.Count = 1 Then
-                GesamtVZBetrag = SQL.DLookup("isnull(sum(UStVAn_VZBetrag),0)", "tblUStVAntrag", "UStVAn_KuNr='" & KdSearchBox1.KdNr & "'", "FMZOLL", "0")
+                    GesamtUSteuer = dt.Rows(0).Item("UStV_SummeUmsatzsteuerbetragEUR")
+                    GesamtErstattung = dt.Rows(0).Item("UStV_SummeErstattungsbetragEUR")
+                    Gesamt3470 = dt.Rows(0).Item("UStV_Summe3470BetragEUR")
+                    GesamtVZBetrag = dt.Rows(0).Item("UStV_SummeVZBetragEUR")
+                    VorschaubetrGes = dt.Rows(0).Item("UStV_SummeVorschaubetragEUR")
+                Else
+                    GesamtUSteuer = 0
+                    GesamtErstattung = 0
+                    Gesamt3470 = 0
+                    GesamtVZBetrag = 0
+                    VorschaubetrGes = 0
+
+                End If
+
+                'GesamtUSteuer = SQL.DLookup("isnull(sum(UStVAn_USteuerbetragEUR),0)", "tblUStVAntrag", "UStVAn_KuNr='" & KdSearchBox1.KdNr & "'", "FMZOLL", "0")
+                'GesamtErstattung = SQL.DLookup("isnull(sum(UStVAn_ErstattungsbetragEUR),0)", "tblUStVAntrag", "UStVAn_KuNr='" & KdSearchBox1.KdNr & "'", "FMZOLL", "0")
+                'Gesamt3470 = SQL.DLookup("isnull(sum(UStVAn_3470),0)", "tblUStVAntrag", "UStVAn_KuNr='" & KdSearchBox1.KdNr & "'", "FMZOLL", "0")
+                'GesamtVZBetrag = SQL.DLookup("isnull(sum(UStVAn_VZBetrag),0)", "tblUStVAntrag", "UStVAn_KuNr='" & KdSearchBox1.KdNr & "'", "FMZOLL", "0")
 
             Else
                 For Each rows As DataGridViewRow In .Rows
@@ -162,6 +187,7 @@ Public Class usrCntlUSTV
                     If IsNumeric(rows.Cells("UStVAn_3470").Value) Then Gesamt3470 += rows.Cells("UStVAn_3470").Value
                     If IsNumeric(rows.Cells("UStVAn_VZBetrag").Value) Then GesamtVZBetrag += rows.Cells("UStVAn_VZBetrag").Value
                 Next
+                VorschaubetrGes = 0
             End If
 
 
@@ -172,6 +198,7 @@ Public Class usrCntlUSTV
             txtSumDiff.Text = Differnezbetrag.ToString("C2")
             txt3470Betrag.Text = Gesamt3470.ToString("C2")
             txtVZBetrag.Text = GesamtVZBetrag.ToString("C2")
+            txtVorschaubetrGes.Text = VorschaubetrGes.ToString("C2")
 
 
         End With
@@ -583,15 +610,17 @@ Public Class usrCntlUSTV
         Me.Cursor = Cursors.WaitCursor
         Try
 
-
+            If VERAG_PROG_ALLGEMEIN.cMDMFunctionsAllgemein.Update_UStVASummenNeuBerechnen(KdSearchBox1.KdNr) Then
-            If VERAG_PROG_ALLGEMEIN.cMDMFunctionsAllgemein.Update_UStVASummenNeuBerechnen(kdNr) Then
+                ok = VERAG_PROG_ALLGEMEIN.cMDMFunctionsAllgemein.UStVAKunden_SummenNeuBerechnen(KdSearchBox1.KdNr)
-                ok = VERAG_PROG_ALLGEMEIN.cMDMFunctionsAllgemein.UStVAKunden_SummenNeuBerechnen(kdNr)
             End If
         Catch ex As Exception
             Me.Cursor = Cursors.Default
         End Try
 
-        If ok Then MsgBox("Kundendaten wurden aktualisiert!")
+        If ok Then
+            'MsgBox("Kundendaten wurden aktualisiert!")
+            init()
+        End If
         Me.Cursor = Cursors.Default
     End Sub
 End Class

SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb

@@ -377,7 +377,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.txtLeistungsbezeichnung.MaxLines_Warning_Label = Nothing
         Me.txtLeistungsbezeichnung.Name = "txtLeistungsbezeichnung"
         Me.txtLeistungsbezeichnung.Size = New System.Drawing.Size(182, 20)
-        Me.txtLeistungsbezeichnung.TabIndex = 9
+        Me.txtLeistungsbezeichnung.TabIndex = 8
         '
         'Label2
         '
@@ -441,7 +441,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.txtUSTBetrag.MaxLines_Warning_Label = Nothing
         Me.txtUSTBetrag.Name = "txtUSTBetrag"
         Me.txtUSTBetrag.Size = New System.Drawing.Size(154, 20)
-        Me.txtUSTBetrag.TabIndex = 14
+        Me.txtUSTBetrag.TabIndex = 10
         '
         'Label11
         '
@@ -475,7 +475,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.txtUmrechnungskurs.MaxLines_Warning_Label = Nothing
         Me.txtUmrechnungskurs.Name = "txtUmrechnungskurs"
         Me.txtUmrechnungskurs.Size = New System.Drawing.Size(108, 20)
-        Me.txtUmrechnungskurs.TabIndex = 15
+        Me.txtUmrechnungskurs.TabIndex = 11
         '
         'Label12
         '
@@ -509,7 +509,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.txtUSTBetragEUR.MaxLines_Warning_Label = Nothing
         Me.txtUSTBetragEUR.Name = "txtUSTBetragEUR"
         Me.txtUSTBetragEUR.Size = New System.Drawing.Size(154, 20)
-        Me.txtUSTBetragEUR.TabIndex = 16
+        Me.txtUSTBetragEUR.TabIndex = 12
         '
         'Label13
         '
@@ -530,7 +530,7 @@ Partial Class ustCntlUSTV_AntragPosition
         Me.cboLeistungsgeber.Location = New System.Drawing.Point(633, 49)
         Me.cboLeistungsgeber.Name = "cboLeistungsgeber"
         Me.cboLeistungsgeber.Size = New System.Drawing.Size(280, 21)
-        Me.cboLeistungsgeber.TabIndex = 8
+        Me.cboLeistungsgeber.TabIndex = 9
         '
         'Label4
         '

SDL/USTV/ustCntlUSTV_AntragPosition.vb

@@ -1,6 +1,7 @@
 
 
-Imports com.sun.org.apache.bcel.internal.generic
+
+Imports GrapeCity.ActiveReports.ReportsCore.Tools
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class ustCntlUSTV_AntragPosition
@@ -14,6 +15,7 @@ Public Class ustCntlUSTV_AntragPosition
     Public Event EV_NEXT()
     Public Event CHANGED(UStVPo_ID)
     Dim gridAktiv = False
+    Dim txtChanged As Boolean = False
     Private Sub btnBildAuf_Click(sender As Object, e As EventArgs) Handles btnBildAuf.Click
         RaiseEvent EV_PREV()
     End Sub
@@ -58,12 +60,10 @@ Public Class ustCntlUSTV_AntragPosition
             Case 7 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [rmc_daId] FROM [tblRMCImport] where rmc_reDatum='" & UStV_POS.UStVPo_ReDat & "' and rmc_reNr='" & UStV_POS.UStVPo_ReNr & "' and rmc_landKZ='" & Antrag_LandKz & "' AND [rmc_daId] is not null", "FMZOLL",,, -1)
             Case 4 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblMSEInvoices] as inv inner join tblMSECustomers on inv.customer_number = customer_id where invoice_date='" & UStV_POS.UStVPo_ReDat & "' and country='" & Antrag_LandKz & "' AND partner_customer_number = " & kdnr & " AND daId is not null", "FMZOLL",,, -1)
             Case 5 : da_id = sql.getValueTxtBySql("SELECT TOP(1) [daId] FROM [tblUTAImportNew] where Rechnungsdatum='" & UStV_POS.UStVPo_ReDat & "' and Abrechnungsnummer='" & UStV_POS.UStVPo_ReNr & "' and Lieferland_ISO2='" & Antrag_LandKz & "' AND daId is not null", "FMZOLL",,, -1)
-
-
         End Select
-                scanSonstiges.INIT_daId(da_id)
+        scanSonstiges.INIT_daId(da_id)
-                scanUSTVFABest.INIT(kdnr, "KUNDENDATEN", "FA_Bestaetigungen")
+        scanUSTVFABest.INIT(kdnr, "KUNDENDATEN", "FA_Bestaetigungen")
-                scanUSTVVollmachten.INIT(kdnr, "KUNDENDATEN", "USTV_Vollmachten")
+        scanUSTVVollmachten.INIT(kdnr, "KUNDENDATEN", "USTV_Vollmachten")
 
         gridAktiv = True
     End Sub
@@ -108,8 +108,7 @@ Public Class ustCntlUSTV_AntragPosition
         Return UStV_POS.SAVE
     End Function
 
-    Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtRgDatum.PropertyChanged, txtRgNr.TextChanged,
+    Private Sub txtBestellung_TextChanged(sender As Object, e As EventArgs) Handles txtLeistungsbezeichnung.TextChanged, txtRgDatum.TextChanged, txtRgNr.TextChanged, txtUSTBetrag.TextChanged, txtUmrechnungskurs.TextChanged, txtUSTBetragEUR.TextChanged
-            txtLeistungsbezeichnung.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetrag.TextChanged, txtUSTBetragEUR.TextChanged ', cbxAPI.CheckedChanged, cboSchnittstellennr.SelectedIndexChanged
 
         If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub
 
@@ -120,11 +119,36 @@ Public Class ustCntlUSTV_AntragPosition
 
             If sender Is cboLeistungsgeber AndAlso cboLeistungsgeber.SelectedItem <> "" Then
                 UStV_POS.UStVPo_Leistender = cboLeistungsgeber.SelectedItem
+                values_changed()
+            Else
+                txtChanged = True
+            End If
+
+        End If
+
+    End Sub
+
+    Private Sub txtRgDatum_KeyUp(sender As Object, e As KeyEventArgs) Handles txtRgDatum.KeyUp, txtRgNr.KeyUp, txtUSTBetrag.KeyUp, txtUmrechnungskurs.KeyUp, txtUSTBetragEUR.KeyUp
+
+        If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MDM_Leistungen_bearbeiten", Me.FindForm) Then Exit Sub
+
+        If gridAktiv And Me.FindForm IsNot Nothing Then
+            If e.KeyValue = 9 Then
+
+                e.SuppressKeyPress = True
+                If txtChanged Then
+                    values_changed()
+                    txtChanged = False
+                End If
+
 
             End If
-            values_changed()
+
         End If
+
     End Sub
+
+
     Sub values_changed()
         lblSachbearbeiter.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
         lblAenderungsdatum.Text = Now.ToString("dd.MM.yyyy HH:mm")
@@ -192,4 +216,6 @@ Public Class ustCntlUSTV_AntragPosition
         cboLeistungsgeber.changeItem(If(cboLeistungsgeber.Text, ""))
 
     End Sub
+
+
 End Class

SDL/kunden/frmKundenblatt.Designer.vb

@@ -45,7 +45,6 @@ Partial Class frmKundenblatt
         Me.txtInfotext = New System.Windows.Forms.Label()
         Me.tbFirmendaten = New System.Windows.Forms.TabPage()
         Me.Panel4 = New System.Windows.Forms.Panel()
-        Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull()
         Me.tbcntrMain = New System.Windows.Forms.TabControl()
         Me.tbAllgemein = New System.Windows.Forms.TabPage()
         Me.lblAdressenzusatz = New System.Windows.Forms.TextBox()
@@ -129,10 +128,8 @@ Partial Class frmKundenblatt
         Me.lblLetzterSA_SDL = New System.Windows.Forms.Label()
         Me.rtbVermerke = New System.Windows.Forms.RichTextBox()
         Me.tbSDLKarten = New System.Windows.Forms.TabPage()
-        Me.usrcntlKarten = New SDL.usrCntlKartenDaten()
         Me.tbLKW = New System.Windows.Forms.TabPage()
         Me.pnlLKWRight = New System.Windows.Forms.Panel()
-        Me.UsrCntlLKW1 = New SDL.usrCntlLKW()
         Me.pnlLKW = New System.Windows.Forms.Panel()
         Me.dgvLKW = New System.Windows.Forms.DataGridView()
         Me.pnlLKWBottom = New System.Windows.Forms.Panel()
@@ -163,7 +160,6 @@ Partial Class frmKundenblatt
         Me.scanVertragVeragKd = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScan()
         Me.tbBesuchsberichte = New System.Windows.Forms.TabPage()
         Me.tbOfferte = New System.Windows.Forms.TabPage()
-        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
         Me.tbUSTV = New System.Windows.Forms.TabPage()
         Me.tbcntrUSTV = New System.Windows.Forms.TabControl()
         Me.tbUSTVDokumente = New System.Windows.Forms.TabPage()
@@ -174,7 +170,6 @@ Partial Class frmKundenblatt
         Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.scanUSTVVollmachten = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
         Me.tbUSTVAntrage = New System.Windows.Forms.TabPage()
-        Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
         Me.cntxtExcel = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.ToolStripMenuItem3 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem()
@@ -200,6 +195,11 @@ Partial Class frmKundenblatt
         Me.tbiKartenverwaltung = New System.Windows.Forms.ToolStripMenuItem()
         Me.tbiLKW = New System.Windows.Forms.ToolStripMenuItem()
         Me.tbiVERAGCard = New System.Windows.Forms.ToolStripMenuItem()
+        Me.UsrcntlKundeBearbeitenFull1 = New SDL.usrcntlKundeBearbeitenFull()
+        Me.usrcntlKarten = New SDL.usrCntlKartenDaten()
+        Me.UsrCntlLKW1 = New SDL.usrCntlLKW()
+        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
+        Me.UsrCntlUSTV = New SDL.usrCntlUSTV()
         Me.pnlInfo.SuspendLayout()
         Me.tbFirmendaten.SuspendLayout()
         Me.Panel4.SuspendLayout()
@@ -276,7 +276,7 @@ Partial Class frmKundenblatt
         Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25)
         Me.tbFirmendaten.Name = "tbFirmendaten"
         Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 1016)
+        Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 1033)
         Me.tbFirmendaten.TabIndex = 3
         Me.tbFirmendaten.Text = "Firmendaten"
         '
@@ -286,19 +286,9 @@ Partial Class frmKundenblatt
         Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel4.Location = New System.Drawing.Point(3, 3)
         Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(1624, 1010)
+        Me.Panel4.Size = New System.Drawing.Size(1624, 1027)
         Me.Panel4.TabIndex = 0
         '
-        'UsrcntlKundeBearbeitenFull1
-        '
-        Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White
-        Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1"
-        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 1010)
-        Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
-        '
         'tbcntrMain
         '
         Me.tbcntrMain.Appearance = System.Windows.Forms.TabAppearance.FlatButtons
@@ -314,7 +304,7 @@ Partial Class frmKundenblatt
         Me.tbcntrMain.Margin = New System.Windows.Forms.Padding(0)
         Me.tbcntrMain.Name = "tbcntrMain"
         Me.tbcntrMain.SelectedIndex = 0
-        Me.tbcntrMain.Size = New System.Drawing.Size(1638, 1045)
+        Me.tbcntrMain.Size = New System.Drawing.Size(1638, 1062)
         Me.tbcntrMain.TabIndex = 3
         '
         'tbAllgemein
@@ -355,7 +345,7 @@ Partial Class frmKundenblatt
         Me.tbAllgemein.Margin = New System.Windows.Forms.Padding(0)
         Me.tbAllgemein.Name = "tbAllgemein"
         Me.tbAllgemein.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbAllgemein.Size = New System.Drawing.Size(1630, 1016)
+        Me.tbAllgemein.Size = New System.Drawing.Size(1630, 1033)
         Me.tbAllgemein.TabIndex = 0
         Me.tbAllgemein.Text = "Allgemein"
         '
@@ -465,7 +455,7 @@ Partial Class frmKundenblatt
         Me.dgvOffenePosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvOffenePosten.RowHeadersVisible = False
         Me.dgvOffenePosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 417)
+        Me.dgvOffenePosten.Size = New System.Drawing.Size(714, 434)
         Me.dgvOffenePosten.TabIndex = 175
         '
         'btnOP
@@ -805,7 +795,7 @@ Partial Class frmKundenblatt
         Me.dgvSperrliste.Name = "dgvSperrliste"
         Me.dgvSperrliste.ReadOnly = True
         Me.dgvSperrliste.RowHeadersDefaultCellStyle = DataGridViewCellStyle7
-        Me.dgvSperrliste.Size = New System.Drawing.Size(432, 972)
+        Me.dgvSperrliste.Size = New System.Drawing.Size(432, 989)
         Me.dgvSperrliste.TabIndex = 23
         '
         'PictureBox2
@@ -859,7 +849,7 @@ Partial Class frmKundenblatt
         Me.tbZoll.Location = New System.Drawing.Point(4, 25)
         Me.tbZoll.Name = "tbZoll"
         Me.tbZoll.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbZoll.Size = New System.Drawing.Size(1630, 1016)
+        Me.tbZoll.Size = New System.Drawing.Size(1630, 1033)
         Me.tbZoll.TabIndex = 9
         Me.tbZoll.Text = "ZOLL"
         Me.tbZoll.UseVisualStyleBackColor = True
@@ -871,7 +861,7 @@ Partial Class frmKundenblatt
         Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3)
         Me.tbcntrZOLL.Name = "tbcntrZOLL"
         Me.tbcntrZOLL.SelectedIndex = 0
-        Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 1010)
+        Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 1027)
         Me.tbcntrZOLL.TabIndex = 0
         '
         'tabZoll_Artikel
@@ -879,7 +869,7 @@ Partial Class frmKundenblatt
         Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22)
         Me.tabZoll_Artikel.Name = "tabZoll_Artikel"
         Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3)
-        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 984)
+        Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 1001)
         Me.tabZoll_Artikel.TabIndex = 1
         Me.tabZoll_Artikel.Text = "Artikel"
         Me.tabZoll_Artikel.UseVisualStyleBackColor = True
@@ -890,7 +880,7 @@ Partial Class frmKundenblatt
         Me.tbMdm.Location = New System.Drawing.Point(4, 25)
         Me.tbMdm.Name = "tbMdm"
         Me.tbMdm.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbMdm.Size = New System.Drawing.Size(1630, 1016)
+        Me.tbMdm.Size = New System.Drawing.Size(1630, 1033)
         Me.tbMdm.TabIndex = 10
         Me.tbMdm.Text = "MDM"
         Me.tbMdm.UseVisualStyleBackColor = True
@@ -908,7 +898,7 @@ Partial Class frmKundenblatt
         Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0)
         Me.tbcntrMDM.Name = "tbcntrMDM"
         Me.tbcntrMDM.SelectedIndex = 0
-        Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 1010)
+        Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 1027)
         Me.tbcntrMDM.TabIndex = 0
         '
         'tbSDL
@@ -920,7 +910,7 @@ Partial Class frmKundenblatt
         Me.tbSDL.Margin = New System.Windows.Forms.Padding(0)
         Me.tbSDL.Name = "tbSDL"
         Me.tbSDL.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDL.Size = New System.Drawing.Size(1616, 984)
+        Me.tbSDL.Size = New System.Drawing.Size(1616, 1001)
         Me.tbSDL.TabIndex = 5
         Me.tbSDL.Text = "SDL-Leistungen"
         Me.tbSDL.UseVisualStyleBackColor = True
@@ -962,7 +952,7 @@ Partial Class frmKundenblatt
         DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle13
         Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 788)
+        Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 805)
         Me.dgvSDLLeistungenFull.TabIndex = 5
         '
         'Panel6
@@ -1067,7 +1057,7 @@ Partial Class frmKundenblatt
         Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL)
         Me.Panel5.Controls.Add(Me.rtbVermerke)
         Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.Panel5.Location = New System.Drawing.Point(3, 838)
+        Me.Panel5.Location = New System.Drawing.Point(3, 855)
         Me.Panel5.Name = "Panel5"
         Me.Panel5.Size = New System.Drawing.Size(1610, 143)
         Me.Panel5.TabIndex = 177
@@ -1450,21 +1440,11 @@ Partial Class frmKundenblatt
         Me.tbSDLKarten.Location = New System.Drawing.Point(4, 22)
         Me.tbSDLKarten.Name = "tbSDLKarten"
         Me.tbSDLKarten.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbSDLKarten.Size = New System.Drawing.Size(178, 39)
+        Me.tbSDLKarten.Size = New System.Drawing.Size(1616, 1001)
         Me.tbSDLKarten.TabIndex = 7
         Me.tbSDLKarten.Text = "SDL-Kartenverwaltung"
         Me.tbSDLKarten.UseVisualStyleBackColor = True
         '
-        'usrcntlKarten
-        '
-        Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default
-        Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3)
-        Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.usrcntlKarten.Name = "usrcntlKarten"
-        Me.usrcntlKarten.Size = New System.Drawing.Size(172, 33)
-        Me.usrcntlKarten.TabIndex = 0
-        '
         'tbLKW
         '
         Me.tbLKW.Controls.Add(Me.pnlLKWRight)
@@ -1472,7 +1452,7 @@ Partial Class frmKundenblatt
         Me.tbLKW.Location = New System.Drawing.Point(4, 22)
         Me.tbLKW.Name = "tbLKW"
         Me.tbLKW.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbLKW.Size = New System.Drawing.Size(178, 39)
+        Me.tbLKW.Size = New System.Drawing.Size(1616, 1001)
         Me.tbLKW.TabIndex = 4
         Me.tbLKW.Text = "LKWs"
         Me.tbLKW.UseVisualStyleBackColor = True
@@ -1484,22 +1464,9 @@ Partial Class frmKundenblatt
         Me.pnlLKWRight.Location = New System.Drawing.Point(309, 3)
         Me.pnlLKWRight.Name = "pnlLKWRight"
         Me.pnlLKWRight.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0)
-        Me.pnlLKWRight.Size = New System.Drawing.Size(0, 33)
+        Me.pnlLKWRight.Size = New System.Drawing.Size(1304, 995)
         Me.pnlLKWRight.TabIndex = 2
         '
-        'UsrCntlLKW1
-        '
-        Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
-        Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0)
-        Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
-        Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000)
-        Me.UsrCntlLKW1.Name = "UsrCntlLKW1"
-        Me.UsrCntlLKW1.Size = New System.Drawing.Size(0, 33)
-        Me.UsrCntlLKW1.TabIndex = 0
-        '
         'pnlLKW
         '
         Me.pnlLKW.Controls.Add(Me.dgvLKW)
@@ -1508,7 +1475,7 @@ Partial Class frmKundenblatt
         Me.pnlLKW.Dock = System.Windows.Forms.DockStyle.Left
         Me.pnlLKW.Location = New System.Drawing.Point(3, 3)
         Me.pnlLKW.Name = "pnlLKW"
-        Me.pnlLKW.Size = New System.Drawing.Size(306, 33)
+        Me.pnlLKW.Size = New System.Drawing.Size(306, 995)
         Me.pnlLKW.TabIndex = 3
         '
         'dgvLKW
@@ -1549,7 +1516,7 @@ Partial Class frmKundenblatt
         Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle17
         Me.dgvLKW.RowHeadersVisible = False
         Me.dgvLKW.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvLKW.Size = New System.Drawing.Size(306, 0)
+        Me.dgvLKW.Size = New System.Drawing.Size(306, 821)
         Me.dgvLKW.TabIndex = 2
         '
         'pnlLKWBottom
@@ -1561,7 +1528,7 @@ Partial Class frmKundenblatt
         Me.pnlLKWBottom.Controls.Add(Me.Button13)
         Me.pnlLKWBottom.Controls.Add(Me.lblErgebnisse)
         Me.pnlLKWBottom.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlLKWBottom.Location = New System.Drawing.Point(0, -79)
+        Me.pnlLKWBottom.Location = New System.Drawing.Point(0, 883)
         Me.pnlLKWBottom.Name = "pnlLKWBottom"
         Me.pnlLKWBottom.Size = New System.Drawing.Size(306, 112)
         Me.pnlLKWBottom.TabIndex = 3
@@ -1702,7 +1669,7 @@ Partial Class frmKundenblatt
         Me.tbVERAGCard.Location = New System.Drawing.Point(4, 22)
         Me.tbVERAGCard.Name = "tbVERAGCard"
         Me.tbVERAGCard.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbVERAGCard.Size = New System.Drawing.Size(178, 39)
+        Me.tbVERAGCard.Size = New System.Drawing.Size(1616, 1001)
         Me.tbVERAGCard.TabIndex = 6
         Me.tbVERAGCard.Text = "VERAG Card"
         Me.tbVERAGCard.UseVisualStyleBackColor = True
@@ -1714,7 +1681,7 @@ Partial Class frmKundenblatt
         Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill
         Me.Panel3.Location = New System.Drawing.Point(3, 3)
         Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(172, 33)
+        Me.Panel3.Size = New System.Drawing.Size(1610, 995)
         Me.Panel3.TabIndex = 0
         '
         'tbDokumente
@@ -1732,7 +1699,7 @@ Partial Class frmKundenblatt
         Me.tbDokumente.Controls.Add(Me.scanVertragVeragKd)
         Me.tbDokumente.Location = New System.Drawing.Point(4, 22)
         Me.tbDokumente.Name = "tbDokumente"
-        Me.tbDokumente.Size = New System.Drawing.Size(178, 39)
+        Me.tbDokumente.Size = New System.Drawing.Size(1616, 1001)
         Me.tbDokumente.TabIndex = 8
         Me.tbDokumente.Text = "Dokumente"
         Me.tbDokumente.UseVisualStyleBackColor = True
@@ -1930,7 +1897,7 @@ Partial Class frmKundenblatt
         Me.tbBesuchsberichte.Location = New System.Drawing.Point(4, 22)
         Me.tbBesuchsberichte.Name = "tbBesuchsberichte"
         Me.tbBesuchsberichte.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbBesuchsberichte.Size = New System.Drawing.Size(178, 39)
+        Me.tbBesuchsberichte.Size = New System.Drawing.Size(1616, 1001)
         Me.tbBesuchsberichte.TabIndex = 9
         Me.tbBesuchsberichte.Text = "Besuchsberichte"
         Me.tbBesuchsberichte.UseVisualStyleBackColor = True
@@ -1941,27 +1908,17 @@ Partial Class frmKundenblatt
         Me.tbOfferte.Location = New System.Drawing.Point(4, 25)
         Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2)
         Me.tbOfferte.Name = "tbOfferte"
-        Me.tbOfferte.Size = New System.Drawing.Size(1630, 1016)
+        Me.tbOfferte.Size = New System.Drawing.Size(1630, 1033)
         Me.tbOfferte.TabIndex = 11
         Me.tbOfferte.Text = "Offerte"
         Me.tbOfferte.UseVisualStyleBackColor = True
         '
-        'UsrCntlOfferte1
-        '
-        Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1)
-        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
-        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 1016)
-        Me.UsrCntlOfferte1.TabIndex = 0
-        '
         'tbUSTV
         '
         Me.tbUSTV.Controls.Add(Me.tbcntrUSTV)
         Me.tbUSTV.Location = New System.Drawing.Point(4, 25)
         Me.tbUSTV.Name = "tbUSTV"
-        Me.tbUSTV.Size = New System.Drawing.Size(1630, 1016)
+        Me.tbUSTV.Size = New System.Drawing.Size(1630, 1033)
         Me.tbUSTV.TabIndex = 12
         Me.tbUSTV.Text = "USTV"
         Me.tbUSTV.UseVisualStyleBackColor = True
@@ -1975,7 +1932,7 @@ Partial Class frmKundenblatt
         Me.tbcntrUSTV.Margin = New System.Windows.Forms.Padding(0)
         Me.tbcntrUSTV.Name = "tbcntrUSTV"
         Me.tbcntrUSTV.SelectedIndex = 0
-        Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 1016)
+        Me.tbcntrUSTV.Size = New System.Drawing.Size(1630, 1033)
         Me.tbcntrUSTV.TabIndex = 1
         '
         'tbUSTVDokumente
@@ -1988,7 +1945,7 @@ Partial Class frmKundenblatt
         Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVVollmachten)
         Me.tbUSTVDokumente.Location = New System.Drawing.Point(4, 22)
         Me.tbUSTVDokumente.Name = "tbUSTVDokumente"
-        Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 990)
+        Me.tbUSTVDokumente.Size = New System.Drawing.Size(1622, 1007)
         Me.tbUSTVDokumente.TabIndex = 8
         Me.tbUSTVDokumente.Text = "Dokumente"
         Me.tbUSTVDokumente.UseVisualStyleBackColor = True
@@ -2086,19 +2043,11 @@ Partial Class frmKundenblatt
         Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22)
         Me.tbUSTVAntrage.Name = "tbUSTVAntrage"
         Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3)
-        Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45)
+        Me.tbUSTVAntrage.Size = New System.Drawing.Size(1622, 1007)
         Me.tbUSTVAntrage.TabIndex = 9
         Me.tbUSTVAntrage.Text = "USTV-Anträge"
         Me.tbUSTVAntrage.UseVisualStyleBackColor = True
         '
-        'UsrCntlUSTV
-        '
-        Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlUSTV.Name = "UsrCntlUSTV"
-        Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39)
-        Me.UsrCntlUSTV.TabIndex = 0
-        '
         'cntxtExcel
         '
         Me.cntxtExcel.ImageScalingSize = New System.Drawing.Size(24, 24)
@@ -2241,7 +2190,7 @@ Partial Class frmKundenblatt
         '
         Me.cntxtCntxtMDM.ImageScalingSize = New System.Drawing.Size(24, 24)
         Me.cntxtCntxtMDM.Name = "cntxtCntxtMDM"
-        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem8
+        Me.cntxtCntxtMDM.OwnerItem = Me.ToolStripMenuItem4
         Me.cntxtCntxtMDM.Size = New System.Drawing.Size(61, 4)
         Me.cntxtCntxtMDM.Text = "cntxtMDM"
         '
@@ -2375,13 +2324,64 @@ Partial Class frmKundenblatt
         Me.tbiVERAGCard.Size = New System.Drawing.Size(186, 22)
         Me.tbiVERAGCard.Text = "VERAG Card"
         '
+        'UsrcntlKundeBearbeitenFull1
+        '
+        Me.UsrcntlKundeBearbeitenFull1.BackColor = System.Drawing.Color.White
+        Me.UsrcntlKundeBearbeitenFull1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1"
+        Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 1027)
+        Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
+        '
+        'usrcntlKarten
+        '
+        Me.usrcntlKarten.Cursor = System.Windows.Forms.Cursors.Default
+        Me.usrcntlKarten.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.usrcntlKarten.Location = New System.Drawing.Point(3, 3)
+        Me.usrcntlKarten.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.usrcntlKarten.Name = "usrcntlKarten"
+        Me.usrcntlKarten.Size = New System.Drawing.Size(1610, 995)
+        Me.usrcntlKarten.TabIndex = 0
+        '
+        'UsrCntlLKW1
+        '
+        Me.UsrCntlLKW1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlLKW1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.UsrCntlLKW1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.UsrCntlLKW1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlLKW1.Location = New System.Drawing.Point(10, 0)
+        Me.UsrCntlLKW1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.UsrCntlLKW1.MaximumSize = New System.Drawing.Size(1200, 1000)
+        Me.UsrCntlLKW1.Name = "UsrCntlLKW1"
+        Me.UsrCntlLKW1.Size = New System.Drawing.Size(1200, 995)
+        Me.UsrCntlLKW1.TabIndex = 0
+        '
+        'UsrCntlOfferte1
+        '
+        Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1)
+        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
+        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 1033)
+        Me.UsrCntlOfferte1.TabIndex = 0
+        '
+        'UsrCntlUSTV
+        '
+        Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlUSTV.Name = "UsrCntlUSTV"
+        Me.UsrCntlUSTV.Size = New System.Drawing.Size(1616, 1001)
+        Me.UsrCntlUSTV.TabIndex = 0
+        '
         'frmKundenblatt
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoScroll = True
         Me.BackColor = System.Drawing.Color.White
-        Me.ClientSize = New System.Drawing.Size(1595, 1174)
+        Me.ClientSize = New System.Drawing.Size(1595, 1191)
         Me.Controls.Add(Me.lblAbfVerb)
         Me.Controls.Add(Me.btnAbfVerb)
         Me.Controls.Add(Me.tbcntrMain)

SDL/kunden/frmKundenblatt.vb

@@ -1812,7 +1812,7 @@ Public Class frmKundenblatt
 
             .DataSource = SQL.loadDgvBySql("SELECT [KundenNr] as KdNr,[Datum] as Datum,[Rechnung] as Nummer,[Saldo] as Betrag,'-' as [OP-Saldo],'EUR' as Währung ,'-' as [KumSaldoEUR],[Buchungstext]   " &
                                                            " FROM [Offene_Posten_DVO] " &
-                                                           " WHERE KundenNr='" & KUNDE.KundenNrZentrale & "' " & where & "  order BY datum, [OP_ID]  DESC", "FMZOLL")
+                                                           " WHERE KundenNr='" & KUNDE.KundenNrZentrale & "' " & where & "  order BY datum DESC, [OP_ID]  DESC", "FMZOLL")
             If .Columns.Count > 0 Then
 
                 .Columns("KdNr").Visible = False
@@ -1896,14 +1896,18 @@ Public Class frmKundenblatt
             If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige Is Nothing Then Exit Sub
             If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige = "" Then Exit Sub
             Dim where = ""
+            Dim sort = "OP_ID DESC /*, Belegdatum DESC*/"
             If cboFirmaFMZOLL._value <> "" Then
                 where = " AND Firma_ID=" & cboFirmaFMZOLL._value
+                If cboFirmaFMZOLL._value = "19" Then
+                    sort = "Belegdatum ASC"
+                End If
             Else
                 where = If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige.contains("A"), "", " AND Firma_ID IN(" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_FirmenDatenAnzeige & ")")
             End If
             .DataSource = SQL.loadDgvBySql("SELECT [Kontonummer] as KdNr,[Belegdatum] as Datum,[Belegnummer] as Nummer,[Bruttobetrag] as Betrag,[Gesamtausstand] as [OP-Saldo],[Waehrung] as 'Währ.',[KumSaldoEUR],[Mahnstufe] as M, [Fälligkeitsdatum] as 'fällig am' ,[Buchungstext] as Referenz " &
                                                            " FROM [Offene Posten] " &
-                                                           " WHERE [Kontonummer]='" & KUNDE.KundenNrZentrale & "' " & where & " ORDER BY OP_ID DESC /*, Belegdatum DESC*/", "FMZOLL")
+                                                           " WHERE [Kontonummer]='" & KUNDE.KundenNrZentrale & "' " & where & " ORDER BY " & sort, "FMZOLL")
 
 
             If .DataSource Is Nothing Then Exit Sub

SDL/zoll/usrCntlAuswertungenEV_Veranlagungen.vb

@@ -1,6 +1,4 @@
-Imports System.IO
+Public Class usrCntlAuswertungenEV_Veranlagungen
-
-Public Class usrCntlAuswertungenEV_Veranlagungen
 
 
 
@@ -156,10 +154,13 @@ Public Class usrCntlAuswertungenEV_Veranlagungen
                                     End If
 
                                     'Handelsrechnungen
+
                                     Dim dtRg = SQL.DLookupArray("distinct(DRef)", "[zsAnmGdsItemDocCerts] As DOC inner join zsAnmRefs As ANM On ANM.LizenzNr=DOC.LizenzNr And  ANM.OperatorID=DOC.OperatorID And  ANM.AnmID=DOC.AnmID", "(LRN = '" & BezugsNr & "') and DocCd IN ('N380','N325')", EZOLL_SQLSRV, "DRef")
-                                    For Each rg In dtRg
+                                        For Each rg In dtRg
-                                        handelsrechnungen &= semi & rg : semi = ","
+                                            handelsrechnungen &= semi & rg : semi = ","
-                                    Next
+                                        Next
+
+
                             End Select
 
 

VERAG_PROG_ALLGEMEIN/Classes/SQL.vb

@@ -691,7 +691,10 @@ Public Class SQL
 
         If dt IsNot Nothing Then
             For Each r As DataRow In dt.Rows
-                list.Add(r(srchFieldClearName))
+                If Not IsDBNull(r(srchFieldClearName)) Then
+                    list.Add(r(srchFieldClearName))
+                End If
+
             Next
         End If
         Return list

VERAG_PROG_ALLGEMEIN/Classes/cAPI.vb

@@ -192,7 +192,7 @@ Public Class cAPI
         Me.api_fehlversuch += 1
         Me.SAVE()
     End Sub
-    Public Sub UPDTAE_OK(Optional api_status = 1, Optional api_filepathDestination = Nothing)
+    Public Sub UPDTAE_OK(Optional api_status = 1, Optional api_filepathDestination = Nothing, Optional MethodeName = Nothing)
         Me.api_status = cAPI_Status.OK
         Me.api_finTstmp = Now
         Me.api_filepathDestination = If(api_filepathDestination, Me.api_filepathDestination)
@@ -202,6 +202,7 @@ Public Class cAPI
         Me.api_EMailSubject = If(api_EMailSubject, Me.api_EMailSubject)
         Me.api_EMailText = If(api_EMailText, Me.api_EMailText)
         Me.api_EMailAttCnt = If(api_EMailAttCnt, Me.api_EMailAttCnt)
+        Me.api_errMethodName = If(MethodeName, MethodeName)
         Me.SAVE()
     End Sub
 

VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb

@@ -86,6 +86,7 @@ Public Class cKundenErweitert
     Property kde_WechselErhaltenAm As Object = Nothing
     Property kde_BankgarantielErhaltenAm As Object = Nothing
     Property kde_WechselBlanko As Boolean = False
+    Property kde_UStV_SummeVorschaubetragEUR_PLOSE As Object = Nothing
 
 
 
@@ -177,8 +178,7 @@ Public Class cKundenErweitert
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselErhaltenAm", kde_WechselErhaltenAm))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_BankgarantielErhaltenAm", kde_BankgarantielErhaltenAm))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselBlanko", kde_WechselBlanko))
-
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_UStV_SummeVorschaubetragEUR_PLOSE", kde_UStV_SummeVorschaubetragEUR_PLOSE))
-
 
         Return list
     End Function

VERAG_PROG_ALLGEMEIN/Classes/cMDMFunctionsAllgemein.vb

@@ -1,4 +1,6 @@
-Public Class cMDMFunctionsAllgemein
+Imports javax.validation.constraints
+
+Public Class cMDMFunctionsAllgemein
 
     Shared Function Update_UStVASummenNeuBerechnen(KundenNr As Integer) As Boolean
         Try
@@ -7,7 +9,7 @@
 
             If KundenNr < 0 Then Return False
 
-            Dim dtKundenAntrage As DataTable = SQL.loadDgvBySql("SELECT tblUStVAntrag.UStVAn_ID, tblUStVAntrag.UStVAn_KuNr FROM tblUStVAntrag ORDER BY tblUStVAntrag.UStVAn_ID where UStVAn_KuNr = " & KundenNr, "FMZOLL")
+            Dim dtKundenAntrage As DataTable = SQL.loadDgvBySql("SELECT tblUStVAntrag.UStVAn_ID, tblUStVAntrag.UStVAn_KuNr FROM tblUStVAntrag where UStVAn_KuNr = " & KundenNr & "ORDER BY tblUStVAntrag.UStVAn_ID", "FMZOLL")
 
             If dtKundenAntrage.Rows.Count < 1 Then Return False
 
@@ -79,7 +81,6 @@
 
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
-
             Return False
 
         End Try
@@ -88,6 +89,9 @@
     Shared Function UStVAKunden_SummenNeuBerechnen(Optional KundenNr As Integer = 0) As Boolean
         Try
 
+            Dim sumChangedPLOSEOK As Boolean = True
+            Dim sumChangedPLOSE As Boolean = True
+
             Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
             Dim sqlWhere = ""
             If KundenNr > 0 Then
@@ -99,8 +103,9 @@
             End If
 
             'alle Kunden, die eine SteuerNr hinterlegt haben inkl. deren hinterlegte Summen!
-            Dim sqlKunden = "SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR_VERAG, Kunden.UStV_SummeVorschaubetragEUR_IDS, Kunden.UStV_SummeVorschaubetragEUR_IT, Kunden.UStV_SummeVorschaubetragEUR_MSE, Kunden.UStV_SummeVorschaubetragEUR_UTA, Kunden.UStV_SummeVorschaubetragEUR                                                                      
+            Dim sqlKunden = "SELECT Kunden.KundenNr as KundenNr, Kunden.UStV_SummeUmsatzsteuerbetragEUR, Kunden.UStV_SummeErstattungsbetragEUR, Kunden.UStV_Summe3470BetragEUR, Kunden.UStV_SummeVZBetragEUR, Kunden.UStV_SummeVorschaubetragEUR_VERAG, Kunden.UStV_SummeVorschaubetragEUR_IDS, Kunden.UStV_SummeVorschaubetragEUR_IT, Kunden.UStV_SummeVorschaubetragEUR_MSE, Kunden.UStV_SummeVorschaubetragEUR_UTA, Kunden.UStV_SummeVorschaubetragEUR, kde_UStV_SummeVorschaubetragEUR_PLOSE as UStV_SummeVorschaubetragEUR_PLOSE                                                                 
                                 FROM Kunden 
+                                INNER JOIN [tblKundenErweitert] on [kde_KundenNr] = Kunden.KundenNr
                                 WHERE Kunden.KundenNr " & sqlWhere &
                                 "order by Kunden.KundenNr"
 
@@ -134,6 +139,7 @@
                     Dim curUStV_SummeVorschaubetragEUR_IT As Double
                     Dim curUStV_SummeVorschaubetragEUR_MSE As Double
                     Dim curUStV_SummeVorschaubetragEUR_UTA As Double
+                    Dim curUStV_SummeVorschaubetragEUR_PLOSE As Double
 
                     Dim curUStV_SummeUmsatzsteuerbetragEUR As Double
                     Dim curUStV_SummeErstattungsbetragEUR As Double
@@ -147,12 +153,14 @@
                     curUStV_SummeVorschaubetragEUR_IT = UStVKunden_Summen_lesen_Vorschau_IT(r.Item("KundenNr"), invoiceDate)
                     curUStV_SummeVorschaubetragEUR_MSE = UStVKunden_Summen_lesen_Vorschau_MSE(r.Item("KundenNr"), invoiceDate)
                     curUStV_SummeVorschaubetragEUR_UTA = UStVKunden_Summen_lesen_Vorschau_UTA(r.Item("KundenNr"), invoiceDate)
+                    curUStV_SummeVorschaubetragEUR_PLOSE = UStVKunden_Summen_lesen_Vorschau_PLOSE(r.Item("KundenNr"), invoiceDate)
 
                     curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_VERAG
                     curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_IDS
                     curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_IT
                     curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_MSE
                     curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_UTA
+                    curUStV_SummeVorschaubetragEUR += curUStV_SummeVorschaubetragEUR_PLOSE
 
                     Dim displayViewKundenSummen = New DataView(dtKundenSummen, "", "UStVAn_KuNr", DataViewRowState.CurrentRows)
                     Dim KundenDTSummenNeuBerechnet As DataTable = displayViewKundenSummen.ToTable(False)
@@ -162,10 +170,12 @@
                         curUStV_SummeErstattungsbetragEUR = IIf(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeErstattung").ToString <> "" AndAlso IsNumeric(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeErstattung").ToString), CDbl(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeErstattung").ToString), 0)
                         curUStV_Summe3470BetragEUR = IIf(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeKonto3470").ToString <> "" AndAlso IsNumeric(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeKonto3470").ToString), CDbl(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeKonto3470").ToString), 0)
                         curUStV_SummeVZBetragEUR = IIf(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeVorauszahlung").ToString <> "" AndAlso IsNumeric(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeVorauszahlung").ToString), CDbl(KundenDTSummenNeuBerechnet.Rows(0).Item("UStVKu_SummeVorauszahlung").ToString), 0)
-
                     End If
                     Dim sumChanged As Boolean = False
 
+                    Dim sumChangedOK As Boolean = False
+
+
                     If Not (CDbl(r.Item("UStV_SummeUmsatzsteuerbetragEUR")) = curUStV_SummeUmsatzsteuerbetragEUR And
                        CDbl(r.Item("UStV_SummeErstattungsbetragEUR")) = curUStV_SummeErstattungsbetragEUR And
                        CDbl(r.Item("UStV_Summe3470BetragEUR")) = curUStV_Summe3470BetragEUR And
@@ -177,37 +187,47 @@
                        CDbl(r.Item("UStV_SummeVorschaubetragEUR_UTA")) = curUStV_SummeVorschaubetragEUR_UTA And
                        CDbl(r.Item("UStV_SummeVorschaubetragEUR")) = curUStV_SummeVorschaubetragEUR) Then
                         sumChanged = True
+                        sumChangedOK = False
                     End If
 
+                    If CDbl(r.Item("UStV_SummeVorschaubetragEUR_PLOSE")) = curUStV_SummeVorschaubetragEUR_PLOSE Then
+                        sumChangedPLOSE = True
+                        sumChangedPLOSEOK = False
+                    End If
+
+
                     If sumChanged Then
                         'updateSummen
-                        sql.doSQL("Update Kunden set  Kunden.UStV_SummeUmsatzsteuerbetragEUR = " & curUStV_SummeUmsatzsteuerbetragEUR & ",
+                        sumChangedOK = sql.doSQL("Update Kunden set  Kunden.UStV_SummeUmsatzsteuerbetragEUR = " & curUStV_SummeUmsatzsteuerbetragEUR.ToString.Replace(",", ".") & ",
-				                    Kunden.UStV_SummeErstattungsbetragEUR = " & curUStV_SummeErstattungsbetragEUR & ",
+				                    Kunden.UStV_SummeErstattungsbetragEUR = " & curUStV_SummeErstattungsbetragEUR.ToString.Replace(",", ".") & ",
-				                    Kunden.UStV_Summe3470BetragEUR = " & curUStV_Summe3470BetragEUR & ",
+				                    Kunden.UStV_Summe3470BetragEUR = " & curUStV_Summe3470BetragEUR.ToString.Replace(",", ".") & ",
-				                    Kunden.UStV_SummeVZBetragEUR = " & curUStV_SummeVZBetragEUR & ",
+				                    Kunden.UStV_SummeVZBetragEUR = " & curUStV_SummeVZBetragEUR.ToString.Replace(",", ".") & ",
-				                    Kunden.UStV_SummeVorschaubetragEUR_VERAG = " & curUStV_SummeVorschaubetragEUR_VERAG & ",
-				                    Kunden.UStV_SummeVorschaubetragEUR_IDS = " & curUStV_SummeVorschaubetragEUR_IDS & ",
-				                    Kunden.UStV_SummeVorschaubetragEUR_IT = " & curUStV_SummeVorschaubetragEUR_IT & ",
-				                    Kunden.UStV_SummeVorschaubetragEUR_MSE = " & curUStV_SummeVorschaubetragEUR_MSE & ",
-				                    Kunden.UStV_SummeVorschaubetragEUR_UTA = " & curUStV_SummeVorschaubetragEUR_UTA & ",
-				                    Kunden.UStV_SummeVorschaubetragEUR  = " & curUStV_SummeVorschaubetragEUR, "FMZOLL")
-
-
-                        'UStVKunden_Summen_speichern_Vorschau_VERAG
-                        'UPDATE Kunden SET Kunden.UStV_SummeVorschaubetragEUR_VERAG = CCur(Nz(DSum("[SteuerbetragEUR]","qryUStVVorschau_VERAG","[RechnungsKundenNr] = " & [Kunden]![KundenNr]),0))
-                        'WHERE (((Kunden.KundenNr)=[prmUStVKu_KuNr]));
-
-                        'UStVKunden_Summen_speichern_Vorschau_IDS
-                        'UPDATE Kunden SET Kunden.UStV_SummeVorschaubetragEUR_IDS = CCur(Nz(DSum("[SteuerbetragEUR]","qryUStVVorschau_IDS","[RechnungsKundenNr] = " & [Kunden]![KundenNr]),0))
-                        'WHERE (((Kunden.KundenNr)=[prmUStVKu_KuNr]));
-
-
 
+				                    Kunden.UStV_SummeVorschaubetragEUR_VERAG = " & curUStV_SummeVorschaubetragEUR_VERAG.ToString.Replace(",", ".") & ",
+				                    Kunden.UStV_SummeVorschaubetragEUR_IDS = " & curUStV_SummeVorschaubetragEUR_IDS.ToString.Replace(",", ".") & ",
+				                    Kunden.UStV_SummeVorschaubetragEUR_IT = " & curUStV_SummeVorschaubetragEUR_IT.ToString.Replace(",", ".") & ",
+				                    Kunden.UStV_SummeVorschaubetragEUR_MSE = " & curUStV_SummeVorschaubetragEUR_MSE.ToString.Replace(",", ".") & ",
+				                    Kunden.UStV_SummeVorschaubetragEUR_UTA = " & curUStV_SummeVorschaubetragEUR_UTA.ToString.Replace(",", ".") & ",
+				                    Kunden.UStV_SummeVorschaubetragEUR  = " & curUStV_SummeVorschaubetragEUR.ToString.Replace(",", "."), "FMZOLL")
                     End If
 
+                    If sumChangedPLOSE Then
+                        sumChangedPLOSEOK = sql.doSQL("Update tblKundenErweitert set  kde_UStV_SummeVorschaubetragEUR_PLOSE = " & curUStV_SummeVorschaubetragEUR_PLOSE.ToString.Replace(",", ".") & "", "FMZOLL")
+                    End If
+
+                    'UStVKunden_Summen_speichern_Vorschau_VERAG
+                    'UPDATE Kunden SET Kunden.UStV_SummeVorschaubetragEUR_VERAG = CCur(Nz(DSum("[SteuerbetragEUR]","qryUStVVorschau_VERAG","[RechnungsKundenNr] = " & [Kunden]![KundenNr]),0))
+                    'WHERE (((Kunden.KundenNr)=[prmUStVKu_KuNr]));
+
+                    'UStVKunden_Summen_speichern_Vorschau_IDS
+                    'UPDATE Kunden SET Kunden.UStV_SummeVorschaubetragEUR_IDS = CCur(Nz(DSum("[SteuerbetragEUR]","qryUStVVorschau_IDS","[RechnungsKundenNr] = " & [Kunden]![KundenNr]),0))
+                    'WHERE (((Kunden.KundenNr)=[prmUStVKu_KuNr]));
+
                 Next
             End If
 
+            Return sumChangedPLOSEOK And sumChangedPLOSEOK
+
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
 
@@ -291,7 +311,7 @@
                     ORDER BY dbo.tblDieselArchiv.KdNrVERAG, dbo.tblSteuernummern.LandNr"
 
 
-            Dim dtIT As DataTable = SQL.loadDgvBySql(sqlFMZollDaten, "FMZOLL")
+            Dim dtIT As DataTable = sql.loadDgvBySql(sqlFMZollDaten, "FMZOLL")
 
             For Each r As DataRow In dtIT.Rows
                 Dim UST_org = CDbl(r.Item("Vorschaubetrag"))
@@ -311,6 +331,51 @@
 
     End Function
 
+    Shared Function UStVKunden_Summen_lesen_Vorschau_PLOSE(varUStVAn_KuNr As Integer, invoiceDate As Date) As Double
+
+        '1300     dtmRechnungsdatum = IIf(Date > DateSerial(Year(Date), 6, 30), DateSerial(Year(Date), 1, 1), DateSerial(Year(Date) - 1, 1, 1))
+        '1310     strParameter = ParameterBereitstellen(varUStVAn_KuNr, dtmRechnungsdatum)
+        '1320     Set qdf = dbs.CreateQueryDef("")
+        '1330     With qdf
+        '1340         .Connect = AktuelleVerbindungszeichenfolge(0)
+        '1350         .ReturnsRecords = True
+        '1360         .SQL = "EXEC [dbo].[spUStVVorschau_IDS_Summe] " & strParameter
+        '1370         Set rst = qdf.OpenRecordset()
+        '1380     End With
+        '1390     Do Until rst.EOF
+        '1400         UStVKunden_Summen_lesen_Vorschau_IDS = UStVKunden_Summen_lesen_Vorschau_IDS + rst![Vorschaubetrag]
+        '1410         rst.MoveNext
+        '1420     Loop
+        Try
+
+            Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
+            Dim summeSchnittstelle As Double
+
+            Dim sqlPLOSE = "select plose_POLSEKundennummer, sum([plose_MWSTBetrag])[plose_MWSTBetrag] FROM [tblPLOSE_Details]  INNER JOIN Adressen on PLOSEKundenNr=plose_POLSEKundennummer
+                    WHERE plose_Archiv = 1 AND plose_LieferantCode IN (0,1,7) AND cast(plose_RechnungsDatum as date) >= '" & invoiceDate.ToShortDateString & "' and plose_POLSEKundennummer =  " & varUStVAn_KuNr & "
+                    group by  plose_POLSEKundennummer"
+
+
+            Dim dtPLOSE As DataTable = sql.loadDgvBySql(sqlPLOSE, "FMZOLL")
+
+            For Each r As DataRow In dtPLOSE.Rows
+                Dim UST_org = CDbl(r.Item("plose_MWSTBetrag"))
+                If UST_org <> 0 Then
+                    summeSchnittstelle += UST_org
+                End If
+            Next
+
+            Return summeSchnittstelle
+
+        Catch ex As Exception
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
+
+            Return 0
+
+        End Try
+
+    End Function
+
     Shared Function UStVKunden_Summen_lesen_Vorschau_IT(varUStVAn_KuNr As Integer, invoiceDate As Date) As Double
 
         '        Dim qdf As DAO.QueryDef
@@ -359,7 +424,7 @@
                                     AND (dbo.tblMautITArchiv.Verrechnungsdatum >= '" & invoiceDate.ToShortDateString & "')
                     GROUP BY dbo.tblSteuernummern.AdressenNr, dbo.tblSteuernummern.LandNr, dbo.tblMautITArchiv.Verrechnungsdatum, dbo.tblMautITArchiv.Code_Adressat_des_Kontoauszugs"
 
-            Dim dtIT As DataTable = SQL.loadDgvBySql(sqlITSumme, "FMZOLL")
+            Dim dtIT As DataTable = sql.loadDgvBySql(sqlITSumme, "FMZOLL")
 
             For Each r As DataRow In dtIT.Rows
                 Dim UST_org = CDbl(r.Item("Vorschaubetrag"))
@@ -443,7 +508,7 @@
             Next
 
 
-            Return summealteSchnittstelle + summeNeueSchnittstelle
+            Return summeAlteSchnittstelle + summeNeueSchnittstelle
 
         Catch ex As Exception
             VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
@@ -547,6 +612,9 @@
                 End If
             Next
 
+            If Math.Round(summeAlteSchnittstelle, 2) = Math.Round(summeNeueSchnittstelle, 2) Then
+                Return summeNeueSchnittstelle
+            End If
 
             Return summeAlteSchnittstelle + summeNeueSchnittstelle
 

VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb

@@ -105,7 +105,7 @@ Public Class cMSEAPI
 
             rest.AddHeader("X-API-Key", jwt)
 
-            rest.IdleTimeoutMs = 1000000
+            rest.IdleTimeoutMs = 30000
 
             Dim responseJson As String = rest.FullRequestNoBody("GET", "/v1/transactions/new")
             If (rest.LastMethodSuccess <> True) Then