edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2025-10-06 14:50:39 +02:00
parent b425eb35ae c0a54388bc
commit 43b8725975
14 changed files with 444 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SDL/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.4.5.6")>
<Assembly: AssemblyFileVersion("1.4.5.6")>
<Assembly: AssemblyVersion("1.4.5.7")>
<Assembly: AssemblyFileVersion("1.4.5.7")>

BIN
SDL/Resources/CBAM_Auswertung_GP.xlsx
View File

Binary file not shown.

165
SDL/USTV/frmUSTVoffeneAntraege.Designer.vb generated
View File

@@ -23,9 +23,9 @@ Partial Class frmUSTVoffeneAntraege
<System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
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 DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle1 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()
Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel()
Me.btn = New System.Windows.Forms.Button()
Me.Button7 = New System.Windows.Forms.Button()
@@ -48,18 +48,20 @@ Partial Class frmUSTVoffeneAntraege
Me.Label4 = New System.Windows.Forms.Label()
Me.pnlLand = New System.Windows.Forms.Panel()
Me.Label5 = New System.Windows.Forms.Label()
Me.cbxKundeLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.cbxNichtEroeffneteAntraege = New System.Windows.Forms.CheckBox()
Me.cbxUStV = New System.Windows.Forms.CheckBox()
Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.AntragEröffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.Button4 = New System.Windows.Forms.Button()
Me.cbxKundeLand = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtmaxAnz = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtMWST = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.txtAnzahl = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.MyDatagridview1 = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.cbxKundenMWST = New System.Windows.Forms.CheckBox()
Me.Label6 = New System.Windows.Forms.Label()
Me.cbxLieferant = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.FlowLayoutPanel.SuspendLayout()
Me.Panel4.SuspendLayout()
Me.pnlLand.SuspendLayout()
@@ -82,7 +84,7 @@ Partial Class frmUSTVoffeneAntraege
Me.FlowLayoutPanel.Controls.Add(Me.btnAlle)
Me.FlowLayoutPanel.Location = New System.Drawing.Point(12, 29)
Me.FlowLayoutPanel.Name = "FlowLayoutPanel"
Me.FlowLayoutPanel.Size = New System.Drawing.Size(1409, 31)
Me.FlowLayoutPanel.Size = New System.Drawing.Size(1770, 31)
Me.FlowLayoutPanel.TabIndex = 28
'
'btn
@@ -176,7 +178,7 @@ Partial Class frmUSTVoffeneAntraege
'
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.Location = New System.Drawing.Point(1584, 639)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(42, 13)
Me.Label2.TabIndex = 38
@@ -186,7 +188,7 @@ Partial Class frmUSTVoffeneAntraege
'
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.Location = New System.Drawing.Point(1586, 661)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(40, 13)
Me.Label1.TabIndex = 40
@@ -202,7 +204,7 @@ Partial Class frmUSTVoffeneAntraege
Me.Panel4.Controls.Add(Me.dat_Sum_Von)
Me.Panel4.Location = New System.Drawing.Point(16, 62)
Me.Panel4.Name = "Panel4"
Me.Panel4.Size = New System.Drawing.Size(417, 33)
Me.Panel4.Size = New System.Drawing.Size(778, 33)
Me.Panel4.TabIndex = 41
'
'Label46
@@ -243,7 +245,7 @@ Partial Class frmUSTVoffeneAntraege
'
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(1295, 9)
Me.Label3.Location = New System.Drawing.Point(1656, 9)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(50, 13)
Me.Label3.TabIndex = 43
@@ -253,7 +255,7 @@ Partial Class frmUSTVoffeneAntraege
'
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(1293, 60)
Me.cbxAlleoffenen.Location = New System.Drawing.Point(1654, 60)
Me.cbxAlleoffenen.Name = "cbxAlleoffenen"
Me.cbxAlleoffenen.Size = New System.Drawing.Size(128, 17)
Me.cbxAlleoffenen.TabIndex = 44
@@ -273,7 +275,7 @@ Partial Class frmUSTVoffeneAntraege
'
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(170, 9)
Me.Label4.Location = New System.Drawing.Point(322, 9)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(68, 13)
Me.Label4.TabIndex = 47
@@ -282,15 +284,17 @@ Partial Class frmUSTVoffeneAntraege
'pnlLand
'
Me.pnlLand.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.pnlLand.Controls.Add(Me.Label6)
Me.pnlLand.Controls.Add(Me.cbxLieferant)
Me.pnlLand.Controls.Add(Me.Label5)
Me.pnlLand.Controls.Add(Me.cbxKundeLand)
Me.pnlLand.Controls.Add(Me.cbxNichtEroeffneteAntraege)
Me.pnlLand.Controls.Add(Me.cbxUStV)
Me.pnlLand.Controls.Add(Me.Label4)
Me.pnlLand.Controls.Add(Me.MyComboBox1)
Me.pnlLand.Location = New System.Drawing.Point(807, 62)
Me.pnlLand.Location = New System.Drawing.Point(1016, 62)
Me.pnlLand.Name = "pnlLand"
Me.pnlLand.Size = New System.Drawing.Size(480, 35)
Me.pnlLand.Size = New System.Drawing.Size(632, 35)
Me.pnlLand.TabIndex = 42
Me.pnlLand.Visible = False
'
@@ -298,17 +302,28 @@ Partial Class frmUSTVoffeneAntraege
'
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(18, 9)
Me.Label5.Location = New System.Drawing.Point(170, 9)
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(68, 13)
Me.Label5.TabIndex = 49
Me.Label5.Text = "Land-Kunde:"
'
'cbxKundeLand
'
Me.cbxKundeLand._allowedValuesFreiText = Nothing
Me.cbxKundeLand._allowFreiText = False
Me.cbxKundeLand._value = ""
Me.cbxKundeLand.FormattingEnabled = True
Me.cbxKundeLand.Location = New System.Drawing.Point(244, 6)
Me.cbxKundeLand.Name = "cbxKundeLand"
Me.cbxKundeLand.Size = New System.Drawing.Size(72, 21)
Me.cbxKundeLand.TabIndex = 48
'
'cbxNichtEroeffneteAntraege
'
Me.cbxNichtEroeffneteAntraege.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.cbxNichtEroeffneteAntraege.AutoSize = True
Me.cbxNichtEroeffneteAntraege.Location = New System.Drawing.Point(338, 0)
Me.cbxNichtEroeffneteAntraege.Location = New System.Drawing.Point(490, 0)
Me.cbxNichtEroeffneteAntraege.Name = "cbxNichtEroeffneteAntraege"
Me.cbxNichtEroeffneteAntraege.Size = New System.Drawing.Size(134, 17)
Me.cbxNichtEroeffneteAntraege.TabIndex = 46
@@ -319,13 +334,24 @@ Partial Class frmUSTVoffeneAntraege
'
Me.cbxUStV.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.cbxUStV.AutoSize = True
Me.cbxUStV.Location = New System.Drawing.Point(338, 17)
Me.cbxUStV.Location = New System.Drawing.Point(490, 17)
Me.cbxUStV.Name = "cbxUStV"
Me.cbxUStV.Size = New System.Drawing.Size(88, 17)
Me.cbxUStV.TabIndex = 46
Me.cbxUStV.Text = " nur mit UStV"
Me.cbxUStV.UseVisualStyleBackColor = True
'
'MyComboBox1
'
Me.MyComboBox1._allowedValuesFreiText = Nothing
Me.MyComboBox1._allowFreiText = False
Me.MyComboBox1._value = ""
Me.MyComboBox1.FormattingEnabled = True
Me.MyComboBox1.Location = New System.Drawing.Point(396, 5)
Me.MyComboBox1.Name = "MyComboBox1"
Me.MyComboBox1.Size = New System.Drawing.Size(72, 21)
Me.MyComboBox1.TabIndex = 46
'
'ContextMenuStrip1
'
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AntragEröffnenToolStripMenuItem})
@@ -348,28 +374,6 @@ Partial Class frmUSTVoffeneAntraege
Me.Button4.Text = "PDFs prüfen"
Me.Button4.UseVisualStyleBackColor = True
'
'cbxKundeLand
'
Me.cbxKundeLand._allowedValuesFreiText = Nothing
Me.cbxKundeLand._allowFreiText = False
Me.cbxKundeLand._value = ""
Me.cbxKundeLand.FormattingEnabled = True
Me.cbxKundeLand.Location = New System.Drawing.Point(92, 6)
Me.cbxKundeLand.Name = "cbxKundeLand"
Me.cbxKundeLand.Size = New System.Drawing.Size(72, 21)
Me.cbxKundeLand.TabIndex = 48
'
'MyComboBox1
'
Me.MyComboBox1._allowedValuesFreiText = Nothing
Me.MyComboBox1._allowFreiText = False
Me.MyComboBox1._value = ""
Me.MyComboBox1.FormattingEnabled = True
Me.MyComboBox1.Location = New System.Drawing.Point(244, 5)
Me.MyComboBox1.Name = "MyComboBox1"
Me.MyComboBox1.Size = New System.Drawing.Size(72, 21)
Me.MyComboBox1.TabIndex = 46
'
'txtmaxAnz
'
Me.txtmaxAnz._DateTimeOnly = False
@@ -386,7 +390,7 @@ Partial Class frmUSTVoffeneAntraege
Me.txtmaxAnz._WaehrungZeichen = True
Me.txtmaxAnz.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.txtmaxAnz.ForeColor = System.Drawing.Color.Black
Me.txtmaxAnz.Location = New System.Drawing.Point(1362, 6)
Me.txtmaxAnz.Location = New System.Drawing.Point(1723, 6)
Me.txtmaxAnz.MaxLineLength = -1
Me.txtmaxAnz.MaxLines_Warning = ""
Me.txtmaxAnz.MaxLines_Warning_Label = Nothing
@@ -412,7 +416,7 @@ Partial Class frmUSTVoffeneAntraege
Me.txtMWST._WaehrungZeichen = True
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.Location = New System.Drawing.Point(1682, 658)
Me.txtMWST.MaxLineLength = -1
Me.txtMWST.MaxLines_Warning = ""
Me.txtMWST.MaxLines_Warning_Label = Nothing
@@ -437,7 +441,7 @@ Partial Class frmUSTVoffeneAntraege
Me.txtAnzahl._WaehrungZeichen = True
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.Location = New System.Drawing.Point(1682, 636)
Me.txtAnzahl.MaxLineLength = -1
Me.txtAnzahl.MaxLines_Warning = ""
Me.txtAnzahl.MaxLines_Warning_Label = Nothing
@@ -456,37 +460,37 @@ Partial Class frmUSTVoffeneAntraege
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)
DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control
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.WindowText
DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.MyDatagridview1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
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.MyDatagridview1.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
Me.MyDatagridview1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
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.ControlText
DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.MyDatagridview1.DefaultCellStyle = DataGridViewCellStyle5
DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.MyDatagridview1.DefaultCellStyle = DataGridViewCellStyle2
Me.MyDatagridview1.Location = New System.Drawing.Point(12, 98)
Me.MyDatagridview1.Name = "MyDatagridview1"
Me.MyDatagridview1.ReadOnly = True
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.MyDatagridview1.RowHeadersDefaultCellStyle = DataGridViewCellStyle6
DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.MyDatagridview1.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
Me.MyDatagridview1.RowHeadersWidth = 62
Me.MyDatagridview1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
Me.MyDatagridview1.Size = New System.Drawing.Size(1409, 528)
Me.MyDatagridview1.Size = New System.Drawing.Size(1770, 528)
Me.MyDatagridview1.TabIndex = 30
'
'cbxKundenMWST
@@ -495,7 +499,7 @@ Partial Class frmUSTVoffeneAntraege
Me.cbxKundenMWST.AutoSize = True
Me.cbxKundenMWST.Checked = True
Me.cbxKundenMWST.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxKundenMWST.Location = New System.Drawing.Point(1293, 78)
Me.cbxKundenMWST.Location = New System.Drawing.Point(1654, 78)
Me.cbxKundenMWST.Name = "cbxKundenMWST"
Me.cbxKundenMWST.Size = New System.Drawing.Size(158, 17)
Me.cbxKundenMWST.TabIndex = 47
@@ -503,11 +507,32 @@ Partial Class frmUSTVoffeneAntraege
Me.cbxKundenMWST.UseVisualStyleBackColor = True
Me.cbxKundenMWST.Visible = False
'
'Label6
'
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(18, 9)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(51, 13)
Me.Label6.TabIndex = 51
Me.Label6.Text = "Lieferant:"
'
'cbxLieferant
'
Me.cbxLieferant._allowedValuesFreiText = Nothing
Me.cbxLieferant._allowFreiText = False
Me.cbxLieferant._value = ""
Me.cbxLieferant.FormattingEnabled = True
Me.cbxLieferant.Location = New System.Drawing.Point(92, 6)
Me.cbxLieferant.Name = "cbxLieferant"
Me.cbxLieferant.Size = New System.Drawing.Size(72, 21)
Me.cbxLieferant.TabIndex = 50
'
'frmUSTVoffeneAntraege
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1457, 681)
Me.ClientSize = New System.Drawing.Size(1818, 681)
Me.Controls.Add(Me.cbxKundenMWST)
Me.Controls.Add(Me.Button4)
Me.Controls.Add(Me.lblKunde)
@@ -571,4 +596,6 @@ Partial Class frmUSTVoffeneAntraege
Friend WithEvents btnVerag As Button
Friend WithEvents Button4 As Button
Friend WithEvents cbxKundenMWST As CheckBox
Friend WithEvents Label6 As Label
Friend WithEvents cbxLieferant As VERAG_PROG_ALLGEMEIN.MyComboBox
End Class

44
SDL/USTV/frmUSTVoffeneAntraege.vb
View File

@@ -511,6 +511,7 @@ Public Class frmUSTVoffeneAntraege
Dim sqlwhereMSE = ""
Dim sqlwhereLand = ""
Dim sqlwhereSteuerNr = ""
Dim sqlwhereLieferant = ""
Dim kundenLandISO2 As String = ""
@@ -544,6 +545,11 @@ Public Class frmUSTVoffeneAntraege
End If
If cbxLieferant._value <> "" Then
sqlwhereLieferant &= " and Lieferant = '" & cbxLieferant._value & "'"
End If
If cbxUStV.Checked Then
sqlwhereSteuerNr &= " and isnull(tblSteuernummern.UStV,0) <> 0"
End If
@@ -611,14 +617,21 @@ Public Class frmUSTVoffeneAntraege
Next
If dtKundeMWST.Columns.Contains("KdNr") Then
'bei Einstellung "ALLE KUNDEN"
If dtKundeMWST.Rows.Count > 0 Then sqlwhereLand &= " AND ( NOT "
For Each row As DataRow In dtKundeMWST.Rows
landBez = row.Item("abc").ToString.Replace(";", "'")
counter = counter + 1
sqlwhereLand &= " AND NOT ( AdressenNr = " & row.Item("KdNr") & " AND Einreichland in (" & landBez.ToString.Substring(0, landBez.ToString.Length - 1) & ")) " '& IIf(dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count, "OR ", klammer)
sqlwhereLand &= " ( isnull(AdressenNr,0) = " & row.Item("KdNr") & " AND Einreichland in (" & landBez.ToString.Substring(0, landBez.ToString.Length - 1) & ")) " & IIf(dtKundeMWST.Rows.Count <> 0 And counter <> dtKundeMWST.Rows.Count, "OR ", ")")
Next
Else
'bei Einstellung "SPEZIFISCHER KUNDE"
For Each row As DataRow In dtKundeMWST.Rows
landBez &= "'" & row.Item("LandKz") & "'"
counter = counter + 1
@@ -678,7 +691,7 @@ Public Class frmUSTVoffeneAntraege
Dim sqlstring = "select isnull(UStVAn_ID,0) as antragExisitiert,cast(case when isnull(UStVAn_AntragEingereichtAm,0) = 0 then 0 else 1 end as bit) as eingereicht,tblSteuernummern.UStV as UStV,Lieferant , KdNr, Kundenname, Kundenland, Einreichland from (" & SQLPLOSEUMSTELLUNG & "
Dim sqlstring = "select isnull(UStVAn_ID,0) as antragExisitiert,cast(case when UStVAn_AntragEingereichtAm IS NULL THEN 0 else 1 end as bit) as eingereicht,isnull(tblSteuernummern.UStV,0) as UStV,Lieferant , KdNr, Kundenname, Kundenland, Einreichland from (" & SQLPLOSEUMSTELLUNG & "
UNION ALL
@@ -779,8 +792,8 @@ Public Class frmUSTVoffeneAntraege
inner join [Länderverzeichnis für die Außenhandelsstatistik] on temp.Einreichland=LandKz
left join tblUStVAntrag on UStVAn_KuNr = temp.kdnr and UStVAn_ReDatVon <= temp.Rechnungsdatum and UStVAn_ReDatBis >= temp.Rechnungsdatum and [Länderverzeichnis für die Außenhandelsstatistik].LandNr = UStVAn_LandNr and isnull(UStVAn_AntragArt,'MWST') = 'MWST'
left JOIN tblSteuernummern On temp.Einreichland = tblSteuernummern.LandKz and KdNr = tblSteuernummern.AdressenNr
where 1 = 1 and isnull(kde_keineMWSt,0) = 0 " & sqlwhereLand & sqlwhereSteuerNr &
" group by isnull(UStVAn_ID,0) , Lieferant, KdNr, Kundenname,Kundenland, Einreichland, tblSteuernummern.UStV, case when isnull(UStVAn_AntragEingereichtAm,0) = 0 then 0 else 1 end "
where 1 = 1 and isnull(kde_keineMWSt,0) = 0 " & sqlwhereLand & sqlwhereSteuerNr & sqlwhereLieferant &
" group by isnull(UStVAn_ID,0) , Lieferant, KdNr, Kundenname,Kundenland, Einreichland, isnull(tblSteuernummern.UStV,0), case WHEN UStVAn_AntragEingereichtAm IS NULL THEN 0 else 1 end "
Dim SQLWhere = ""
@@ -851,6 +864,27 @@ Public Class frmUSTVoffeneAntraege
Next
End If
If Not cbxLieferant._value <> "" Then
cbxLieferant.Items.Clear()
cbxLieferant.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
Dim list As New List(Of String)
For Each r As DataGridViewRow In .Rows
If r.Cells("Lieferant").Value IsNot Nothing And r.Cells("Lieferant").Value <> "" Then
If Not list.Any(Function(c) c = r.Cells("Lieferant").Value) Then
list.Add(r.Cells("Lieferant").Value)
End If
End If
Next
For Each l In list
Dim listItem As New VERAG_PROG_ALLGEMEIN.MyListItem(l, l)
cbxLieferant.Items.Add(listItem)
Next
End If
txtAnzahl.Text = .Rows.Count
txtMWST.Text = sumMwSt
@@ -997,7 +1031,7 @@ Public Class frmUSTVoffeneAntraege
End Sub
Private Sub cbxKundeLand_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxKundeLand.SelectedIndexChanged
Private Sub cbxKundeLand_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxKundeLand.SelectedIndexChanged, cbxLieferant.SelectedIndexChanged
initDgv_gesamt(txtmaxAnz.Text, cbxNichtEroeffneteAntraege.Checked, IIf(cbxAlleoffenen.Checked, -1, kdNr))
End Sub

11
SDL/USTV/usrCntlUSTV.vb
View File

@@ -680,7 +680,16 @@ Public Class usrCntlUSTV
Else
Dim frm As New frmUSTVoffeneAntraege()
Dim start_date As New Date(Today.Year, 1, 1)
Dim end_date As New Date(Today.Year, 12, 31)
Dim ADR As cAdressen = New cAdressen(kdNr)
Dim frm As New frmUSTVoffeneAntraege(start_date, end_date, kdNr, ADR.Name_1)
frm.Show()
End If

14
SDL/kunden/usrCntlCBAM.vb
View File

@@ -452,7 +452,12 @@ Public Class usrCntlCBAM
,'' as 'importer post code'
,'' as 'importer po box'
,'' as 'importer coordinate longitude (x)'
,'' as 'importer coordinate latitude (y)'"
,'' as 'importer coordinate latitude (y)'
,isnull(max(CZ_Name), '') as 'exporter title'
,isnull(max(CZ_Ländercode), '') as 'exporter country code or member state'
,'' as 'exporter street'
,'' as 'exporter street additional'"
Dim SQL_DAKOSY As String = "SELECT
[Registriernummer_MRN] RegistriernummerATLAS
,PositionNo PositionsNummer
@@ -1189,6 +1194,7 @@ Public Class usrCntlCBAM
Dim f As New List(Of String)
If btnCBAM_DS_DAKOSY_Detail.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Detail.Tag)
If btnCBAM_DS_DAKOSY_Summe.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_Summe.Tag)
If btnCBAM_DS_DAKOSY_GP.Tag <> "" Then f.Add(btnCBAM_DS_DAKOSY_GP.Tag)
If f.Count > 0 Then
'Zwischenablage
@@ -1737,6 +1743,12 @@ Public Class usrCntlCBAM
Blatt.Range("AE" & cnt).Value = row("importer po box")
Blatt.Range("AF" & cnt).Value = row("importer coordinate longitude (x)")
Blatt.Range("AG" & cnt).Value = row("importer coordinate latitude (y)")
Blatt.Range("AH" & cnt).Value = row("exporter title")
Blatt.Range("AI" & cnt).Value = row("exporter country code or member state")
Blatt.Range("AJ" & cnt).Value = row("exporter street")
Blatt.Range("AK" & cnt).Value = row("exporter street additional")
cnt += 1
rowcounter += 1
Next